Attempting to fix dexy dependencies.

Not quite working yet.