Fixes to visualization