Fixes to match the labs infrastructure.