Fix shop/pub