Fixed classes compatibility issues