Fixes for Android