Mac fixes [win]