Fixes after 1.5.6 (may be folded into 1.5.7) --- _Generated by [Claude Code](https://claude.ai/code)_