Performance fixes [win]