Major stability fixes.