WyC: various little tweaks