[PATCH] Further job parsing fixes