diff --git a/src/Calypso-Ring/ClyRing2Environment.class.st b/src/Calypso-Ring/ClyRing2Environment.class.st
index 595921b1f83..96f1e48f75c 100644
--- a/src/Calypso-Ring/ClyRing2Environment.class.st
+++ b/src/Calypso-Ring/ClyRing2Environment.class.st
@@ -87,6 +87,12 @@ ClyRing2Environment >> defaultClassCompiler [
 	^ self class compiler
 ]
 
+{ #category : 'accessing' }
+ClyRing2Environment >> definedClassesInPackage: aPackage [
+
+	^ aPackage definedClasses
+]
+
 { #category : 'accessing' }
 ClyRing2Environment >> environment [
 	^ environment
diff --git a/src/Calypso-SystemTools-Core/ClyClassTableDecorator.class.st b/src/Calypso-SystemTools-Core/ClyClassTableDecorator.class.st
index 60609afd7af..feb975cd450 100644
--- a/src/Calypso-SystemTools-Core/ClyClassTableDecorator.class.st
+++ b/src/Calypso-SystemTools-Core/ClyClassTableDecorator.class.st
@@ -18,15 +18,15 @@ ClyClassTableDecorator class >> decorateTableCell: anItemCellMorph of: aDataSour
 	| labelMorphExtension cmt |
 	labelMorphExtension := anItemCellMorph label assureExtension.
 	cmt := aDataSourceItem actualObject comment.
-	cmt 
-		ifEmpty: [ cmt := ClyUncommentedItemTableDecorator balloonText ]
-		ifNotEmpty: [ | lines |
-				lines := cmt lines. 
-				cmt := lines first: (lines size min: 3).
-				cmt := String cr join: cmt. ].
-	labelMorphExtension balloonText: cmt 
-		
-		
+
+	((cmt respondsTo: #content)
+		 ifTrue: [ cmt := cmt content ]
+		 ifFalse: [ cmt ]) ifEmpty: [ cmt := ClyUncommentedItemTableDecorator balloonText ] ifNotEmpty: [
+			| lines |
+			lines := cmt lines.
+			cmt := lines first: (lines size min: 3).
+			cmt := String cr join: cmt ].
+	labelMorphExtension balloonText: cmt
 ]
 
 { #category : 'decoration' }