More debug statement changes