Small debugging improvements