Additional tweaks for raspberry pi compatability.