Fix module dependencies