Apply final machine view rendering fixes from bad rebase.