Adjustments to build to work with individual repos and align better with D.O.