Repair of finding and running commands