Add missing file and other changes.