Small bugfixes in Android application