More updates from Owen.

These should merge automatically, I don't want to be doing manual merges, so if you don't we both avoid the pain.