Windows acceptor build fixes