fixing things for 4.7 toolchain