More fixes..