+ fixes for Android