TIme recognition fixes