general stability fixes