Resolved dependency bugs
For #tidyup