Some fix to use the server and for MapCache