More fixes for Android release