4.9.1 toolchain compilation fixes