task fixes