More minor fixes.