Continued minor bug fixes.