additional minor fixes