Add toolchain and build fixes