more fixes on the RPi side