miscellaneous fixes.