more improvements in the scap buffer timeout logic