More fixes and changes