Fixes for toolchains up to 4.7