some shop fixes after pull