Fixes for the recent timer changes.