Modify XML Error & Window Server

Modify XML Error & Window Server