build: temporary changes to build with current toolchain
Toolchain fixes