Minor changes to get it to build on our platform.