Fix broken builds