Fixed bugs on Android