More minor fixes and cleanup.