Updates
More fixes