fix encrypted home and separate base packages