General changes related to convergence of POLCA and Simulate versions