WMS configuration fixes

Fixes #87.

I'd really like to see it part of final 14.8.0.