more compatibility issues fixed