Prepare for FileHeaderFix
Fix missing enclosing
Fix wrong path