Updated modules to be compatible with D9.