Some minor adaptations that were reported