Fix inter module dependencies