Little adaptations for prod