Some minor changes to files