A few miscellaneous fixes.