Bugfixes on Android