SvcTrig fix and couple more wmi modules.