Misc fixes to files