[Android] Minor fixings;