Fix remaining commands and modules