More fixes because of new minus