Various cleanup for job lists