Compatibility issues fixed