follow up r107932 with w/s fixes