Subgoal fixes