Fixes to work with shop_quotable