miscelaneous fixes