WYC: minor tweaks