More tweaks for build debugging.