some fixes with doneDate