MAT: Fix the find commands a bit more