Corrections for new protocol