Raspberry Pi fixes