fixes including TimeLocker