Important: Resolve Android compatibility issues