Fixed packages bugs