Minor changes to follow up on Tom's review