Fixed up the build / package.