bch changes in MakeUncleFiles