Updates based on feedback from @bcaudan