Match installer changes