Fixed bugs with Magento 1.5 support