Even more small changes

I should squash this...