Stability fixes