Fixes for TradeCruncher