Misweaver fixes