make changes requested by upstream