[PATCH 0/3] Fixes and extensions for WPS support