Resolves some of the build errors associated with the md5 migration.