Fixup some simulation issues