More RPi fixes