Fixing up module dependancies