Protocol fixes