Fix some modules