minor ordering fixes