various minor fixes.