Fixing the shop bugs.