Fixing xpath slightly and improving step debug view.