Fix bad dependencies, refs #8