fix some anroid-client issues