References to old cos-window fixed