More fixes I guess