WyCS: various little tweaks after investigating certain issues.