Improved scroll recovery/management