Tweaks to be able to run on Raspberry Pi