build: temporary changes to build with current toolchain
Toolchain fix (gcc 4.8)