Fix compilation warnings.
Add header keyword from catalogue if present.