Fixing order validation messages