Fixing WM build issues