miscellaneous fixes