Index: openacs-4/packages/acs-admin/www/apm/package-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete.tcl,v
diff -u -N -r1.9.8.8 -r1.9.8.9
--- openacs-4/packages/acs-admin/www/apm/package-delete.tcl	5 Sep 2014 15:55:26 -0000	1.9.8.8
+++ openacs-4/packages/acs-admin/www/apm/package-delete.tcl	8 Sep 2014 10:00:05 -0000	1.9.8.9
@@ -28,15 +28,17 @@
 }]
 
 if { [llength $dependent_packages_list] > 0 } {
-    set dependency_warning_text "
-The following packages depend on package <code>$package_key</code> that you are about to delete: 
+    set dependency_warning_text "The following packages depend on package 
+       <code>$package_key</code> that you are about to delete:\n<ul>\n"
 
-<p>
-<code> 
-  [join $dependent_packages_list "<br>"]
-</code>
-</p>
-"
+    foreach pkg_key $dependent_packages_list {
+	set query [export_vars { {package_key $pkg_key}}]
+	append dependency_warning_text [subst {
+	    <li>$pkg_key (<a href="./version-view?$query">manage</a>)</li>
+	}]
+    }
+    append dependency_warning_text "</ul>\n"
+
 } else {
     set dependency_warning_text ""
 }
Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v
diff -u -N -r1.20.8.9 -r1.20.8.10
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl	8 Sep 2014 09:23:29 -0000	1.20.8.9
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl	8 Sep 2014 10:00:05 -0000	1.20.8.10
@@ -4,7 +4,21 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    {version_id:naturalnum,notnull}
+    {version_id:naturalnum,optional}
+    {package_key:optional}
+} -validate {
+    version_id_or_package_key {
+        if {[info exists package_key] && ![info exists version_id]} {
+            set version_id [apm_version_id_from_package_key $package_key]
+            if {$version_id eq ""} {
+                ad_complain "No package with package_key '$package_key' is enabled."
+                return
+            }
+        }
+        if {![info exists version_id]} {
+            ad_complain "Specify a valid version_id."
+        }
+    }
 }
 
 db_1row apm_all_version_info {
@@ -241,7 +255,7 @@
 } else {
     set instances "No installed instance of this package\n"
 }
-if {!$singleton_p} {
+if {$nr_instances == 0 || ($nr_instances > 0 && !$singleton_p)} {
     set query [export_vars { package_key {return_url [ad_return_url]}}]
     set instance_create [subst {
         <li><a href="package-instance-create?$query">Create