Fix bugs becasue of modules changes