ordering fixes