Stability fixes (Critical)