Cleaned up a couple bugs.