[ANDROID] Fix few bugs