Stability and security improvements