Fixes to some of the files.