Mistweaver fixes