Fix bugs with our traverser.