Fix various fallout from timer changes