Fix broken PR builds