Add missing modifications from 1st import.