Various fixes from stock jb fw