Workaround for issue #103, Sync/Rebuild DB timeouts