Merge "Fix debug statements."