Corrected errors related to re-org.