More debug clarity