JobId -> options, minor fixes