General enhancements.