Fixes for sub-Protocols