Minor bugfixes for Android demo application