Fix install and package logic