Some fixes
Protocol fixes