Fixes to stabilization