some minor fixes.