Fixed compatibility issues.