Additional fixes to stabilization