Fixes to header