Additional fixes

I forgot stuff because I'm lame.