Merchant Fixes