Fixed build-time and run-time dependencies.