Fixes for pkg

Note: single collection packages, git:// urls, etc only work in pre-release versions.