diff --git a/config/settings/settings.conf b/config/settings/settings.conf
index 9c2a8a2d..89803b74 100644
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@@ -79,7 +79,7 @@ device=all
 grabDevices=True
 ignoreShortcuts=False
 # the current shortcut layout located in /etc/fenrir/keyboard
-keyboardLayout=desktop
+keyboardLayout=test
 # echo chars while typing.
 charEcho=False
 # echo deleted chars
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_1.py b/src/fenrir-package/commands/commands/clear_bookmark_1.py
index 4be634d3..deb89565 100644
--- a/src/fenrir-package/commands/commands/clear_bookmark_1.py
+++ b/src/fenrir-package/commands/commands/clear_bookmark_1.py
@@ -17,7 +17,7 @@ class command():
         return 'remove Bookmark ' + self.ID        
     
     def run(self):
-        currApp = self.environment['runtime']['applicationManager'].getCurrentApplication()
+        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         
         del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
 
diff --git a/src/fenrir-package/commands/commands/set_bookmark_1.py b/src/fenrir-package/commands/commands/set_bookmark_1.py
index f162e596..a5582b5c 100644
--- a/src/fenrir-package/commands/commands/set_bookmark_1.py
+++ b/src/fenrir-package/commands/commands/set_bookmark_1.py
@@ -21,12 +21,14 @@ class command():
         if not self.env['commandBuffer']['Marks']['1']:
             self.env['runtime']['outputManager'].presentText("No Mark found", interrupt=True)
             return
-        currApp = self.environment['runtime']['applicationManager'].getCurrentApplication()
+        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
         
         self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'] = self.env['commandBuffer']['Marks']['1'].copy()
         if self.env['commandBuffer']['Marks']['2']:
             self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'] = self.env['commandBuffer']['Marks']['2'].copy()
+        else:
+            self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'] = None
         self.env['runtime']['outputManager'].presentText('Bookmark ' + self.ID + " set for application " + currApp, interrupt=True)
         self.env['commandBuffer']['Marks']['1'] = None
         self.env['commandBuffer']['Marks']['2'] = None