Some improvements for running on Raspberry Pi.