4.7.4 toolchain compilation fixes