Fixed a few outstanding bugs.