Miscellaneous enhancements