Minor ordering tweaks