A few minor changes to add some compatability for other mods