Fixed a few annoying things.