Bring across some HudTrails changes and bug fixes.