Compile fixes for new toolchain