Fixed default packages handling