Fix some builds after r240292