More fixes on mod changes