miscellaneous minor fixes