Minor tweaks.

And a better build pipeline view.

Change-Id: I66ede749e4d8d22e6f20d3cdb45d7859b5f52bd8