fix bugs found by qwen3.6-35a3b