Some stability fixes.