Fix up some issues with database clustered timers

This will hopefully fix the intermittent failures