Update to fix some of the broken job submissions lately and changes to new API (not being used yet)