Fixing up the build for 1.2