Fixing up dependencies

Closes #1