Small fixes, task list redefinition.