Minor work on android client