Merge "Fixup typo and disable debug message"