Few fixes of irrelevant files