Small fixes to header