updates for 4.7 toolchain