Fix fall out of previous changes