WMS: misc. fixes/cleanups
Merge pull request #107 from jouvin/umd3-wms

WMS: misc. fixes/cleanups