Fixed compatibility problems