Miscellaneous enhancements.