Build instrumentation

Better instrumentation on build failures