Android: Bugfixes

Two last fixes for the big release.