More fixes!!