Make a bunch of lovely fixes