Fixes to android app