Minor fixes to the Android support