Restore Builder used by DataModelOracle service. Fix some Incremental Build bugs. Fix miscellaneous bugs.