Fix all the things that have not yet been made into pull requests (shame on us if we don't turn these into pull requests)