Some fixes to the cursed-based simulator