Miscellaneous tiny changes.