Fixes for dependencies.