Fixes to file headers