More debug fixes.