Dependency fixes and also added fc.line