Miscellaneous changes and fixes.