More fixes to requirements/tasks.