Task edit fixes