Fixes on ordershop