more wsman fixes/cleanup