Little fixes to headers