Logical order fixes