Mostly changes to enabl;e Farm3 batch submission to work