Minor timer changes