Various fixes for visualization
Merged out conflicts