Bring more files into line with local changes