Fixes to bugs reported by prestashop during first review stage