more windows linking fixes