Minor timer changes/cleanup