Missed some bits that needed changing