Shop fixes