Corrections related to package selector and package changing