Updates to correct Rebuilding issue.