Fixed a couple more last-minute bugs.