Fixed 4.8 toolchain errors