Even moar shop fixes