Re: 2 fixes for inclusion into linux-4.19.y