Fixed a couple quirks.