Fix Protocol classes