miscellaneous fixes and changes as part of finalizing sccs stuff