some more android-related fixes