Additional changes missed before the initial commit.