Fixes to merchant.py