Sort things out a bit