fixes to work with ws-policy