Fixes for extension protocol