WolfDiviner fix and ...?