more ordering fixes