diff --git a/gogo/shell/src/main/resources/gosh_profile b/gogo/shell/src/main/resources/gosh_profile
index 2219e25..2440d94 100644
--- a/gogo/shell/src/main/resources/gosh_profile
+++ b/gogo/shell/src/main/resources/gosh_profile
@@ -11,8 +11,7 @@
 addcommand context ${.context}
 
 # add methods on System object as commands
-# FELIX-2335 prevents the use of (bundle 0) loadclass
-addcommand system ((bundle 1) loadclass java.lang.System)
+addcommand system ((context:bundle 0) loadclass java.lang.System)
 
 # alias to print full stack trace
 e = { $exception printStackTrace }
diff --git a/gogo/shell/src/main/resources/motd b/gogo/shell/src/main/resources/motd
index 43776f7..01954f9 100644
--- a/gogo/shell/src/main/resources/motd
+++ b/gogo/shell/src/main/resources/motd
@@ -1,3 +1,3 @@
-_______________
+____________________________
 Welcome to Apache Felix Gogo