Fix remaining compilation bug caused by the refactoring of modules.