Fixes and new protocol system v2.2