Minor adaptations