WyC: a few more little tweaks.