WCS: more little tweaks