More fixes and changes...