Fixed issues for Android devices.