order validation fixes