Minor improvements to Shopkeeper.