Fixing issues for the shop