further trivial fixes for simulations