Hotfix some modules