Warning fixes and stuff
android buildfix