Tweaks for RPi