Some more fixes to order sim