Minor tweaks for Raspberry Pi environment