Stability fixes
6 files changed