some minor fixes
some minor fixes