Bugfix and simulations definitions