Miscellaneous fixes and changes.