Stability and Pandora fixes