More fixes still