More fixes and a rename