bugfixes for Android