Cosmetic fixes to Job and Machine