Stability fixes...