Fixes to order process