Fixed things I broke.

I blame git for suddenly hating me tonight.

It can't be my fault, it's obviously the software.