Fixes for wps changes