A few fixes to visualization