Fixed job bugs