Update to handle android client better.