android client fixes