Fixes on some visualize issues