tweaks to work on RPi

Auditors: