Minor changes to Android client