Be a bit smarter when increasing the scan buffer and check for limit