fix: Configuration dependency fixes;