Fix issues apparently I apparently missed when utilizing the new ivtoolkit version