Fix latest build break