Update functions so they will work with the latest Foundation.