Fixed a few more minor bugs.