Android fixes

Small fixes to android app