Small shop fixes