More instrumentation to hopefully get build working.