More fixes yes