OP-1309 some small fixes to Stabilization as result of simulator testing