More fixes hopefully