Minor sugar fixes