Fixes for the Android platform