Ordering fixes