CONN-1034: Dependency fixes