Diverse changes

None of this ends up in the repo