Small fixes for better visualization