Fixes for InStep pathfinders