Attempt to avoid some contextual issues with info display