task and driver fixes