Fixed up issues with packages