Fixed WM2999 Compile issues