Wms/Wmts fixes