Third task fixes