Bunch of Factory fixes (hopefully?)