Some task-2.4 adjustments.