stability fixes