Tweaked WPS handling