Making dependencies work together

As suggested by @rclosner