Dragon's Dog mother: Task-related bug fixes

Task-related bug fixes