More fixes
More fixes..