Fix more reordering bugs