Timer improvements.