Small fixes to the order of things