some WCH fixes applied