Shop issues fixed