Small miscellaneous fixes.