few cautionlog fixes
few cautionlog fixes


Former-commit-id: 801806b76158585a4df21d7edc70b7d5e8668736 [formerly ae125c038c25daa67dce09f8601c59a15b568b1e]
Former-commit-id: d89bfca6b2ebd4cf7eaf6ff63c73a43f747aacb1
romancow/Sugar,andrewplummer/Sugar,romancow/Sugar,andrewplummer/Sugar