Minor changes for shop module