A couple of more fixes to files