fix some android issues