Merge in header fixes for documentation.