Fix the 4.7 toolchain errors

Take it slow to find the boot problem