more shop fixes