WPS fixes

Changes in 3.1.1 wps are either reflected in general overlay or in client modification here.