Fixing a few small issues with the last PR

I quite clearly wasn't paying attention before, missed some cleanup that I had intended to do.