More stability fixes.