Fix wander internals