small adaptations for next release