Fixing bugs on Pi