Fixing compatibility issues