More solid rebuild handling