Various fixes for Protocols