miscellaneous fixes due to test results after recent changes