Task fixes