toolchain 4.7 + some changes