Fix RPi issues