Fix dependency issues introduced with anchor.