Final show measurement tweaks