Some more stability fixes