Update to build based on fixes made by prapicault.