Adaptations for OS upgrade