Some job fixes