Order process fixes