Improve stability of oaisim. All the bugs related to oaisim can be grouped under this milestone.