Fixes after timer changes (requires kombu master)