Fixing some portions in protocol