Analysis: fix buildbots