Fixes for new Protocol