Miscellaneous minor fixes.