More fixes, gods, when will it end?