follow task and unstuck fixes