Module dependencies fixed