A few fixes before first simulation.