Fix sample
Increase log
Cosmetic
More fix for #976: Make sure protocol and track msg works together