Simulator additional minor fixes