small debugging improvements