Wcor fixes