Patches to rebuildcheck();