Improvements to static modes
2 files changed