minor ordering issues