Change back fee to new standard
Fix tradestate problem