Minor ordering fixes