Visualization fixes