Misc GAPPS fixes