More fixes and updates