Add a few missing file headers
Fix some additional substitution problems