Fixed dependency issues in protocols.