Fix up latest file changes.