Smarter rebuild completion