Corrections for RaspberryPi builds