More job fixes