Fixed some dependencies on dev versions of modules