Improved WMS Server compatibility.