Fixes for android.