Some visual debugging improvements