Fix storing of jobs and jobhandling