Fixes on undodir and nowrap