more stability fixes