Local fixes on Pi