Minor builder tweaks, still in progress