Still more fixes for Android