Fixed up a few package-related bugs