android compatibility fixes