diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py b/virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py
index 9e314fc..b632401 100644
--- a/virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py
+++ b/virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py
@@ -55,7 +55,7 @@ class CardGenerator(object):
         default_cardno = "1234567890"
         
         logging.warning("Using default SAM parameters. PIN=%s, Card Nr=%s"
-                        & (default_pin, default_cardno))
+                        % (default_pin, default_cardno))
         #TODO: Use user provided data
         self.sam = SAM(default_pin, default_cardno)
         
diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py b/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py
index 32cff87..49ead14 100644
--- a/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py
+++ b/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py
@@ -81,7 +81,7 @@ class SAM(object):
 
         #Security Environments may be saved to/retrieved from this dictionary
         self.saved_SEs = {} 
-        self.current_SE = Security_Environment(self)
+        self.current_SE = Security_Environment(self.mf, self)
 
     def set_MF(self, mf):
         """