android: small fixes