Header enhancements.