Fixed optional dependencies.