Various minor fixes.