Add 2 missing files and other changes