Fixes for Android platform..