Stability fixes.