Small tree and find in files fixes