Small fix and messasge proto update