some android fix ups