Another attempt to get get things to build...