Fix for db connection leak. Fix for new timer.