Change some of the Job-handling in Master because it's Serializable now.