Misc fixes as passed to us

forked from XDA Garwynn