Adding stabilization fixes