Tweaks to allow overridden status properly in certain edge cases.