Merge fixes to issues found while updating toolchain