Fixed bugs related to package changes