WYCS: tweaks for #232