Fixed depends based on upstream changes.

Fixes #12