Small changes to tunnel crawler