Do a bit more reordering