Six minor fixes.