Fix remaining dependencies.