Minor adjusts.
Work around default timer callback.
Work around default timer callback.