Last stabilization fixes.