Updated for recent build environment updates.