Slight tweaks to PR introduced changes

https://github.com/OXID-eSales/oxideshop_ce/pull/171