Fixed packages handling in setup