Fixed: Compatibility issues with plugins