Fixes to OrderActionsForm