More changes to make this compile on a different computer.