More fixes missed previously