Part way through fixes