General stability fixes.