Fix time awaiting bugs caused by introduction of TimeConstraints