fixes in expvisitor and next