Fixed some problems with dependencies in various modules.