fix protocol issues