Compiler fixes for Android