and evdn more fixes