Fixing Android input bug and other minor issues