Various tweaks/fixes to buildDetails refs