Minor bug fixes.