More fixes for dependencies