Update files necessary for 4.1 upgrade.