Minor changes requested by Rod.