Updated to build with new toolchain