Make building for RPi possible for 7.0

... fixes