A few more miscellaneous fixes.