Tweaks to Doc UI work