Stuff

It wasn't really worth the effort me separating theses changes into different pulls - they're pretty minor.