More fixes....maybe....