Android: small bug fixes