fixes for the android build