include subtask fixes