A couple simulator changes