DF Some fixes in master orders.