Resolved compatibility issues