A few traversal fixes