This should fix some incompatabilities with other mods