WPS4R fixes and improvements