fixes for WPS client plugin for asynch use case