More fixes

For some reason, it still doesn't work on the Raspberry PI