Misc fixes + stock kernel patch