Fix up ordering stuff