Pi build improvements