diff --git a/src/build/toolset.py b/src/build/toolset.py
index 6c76f5512..9d4ff3425 100644
--- a/src/build/toolset.py
+++ b/src/build/toolset.py
@@ -310,7 +310,7 @@ def __handle_flag_value (manager, value, ps):
     
     if get_grist (value):
         f = feature.get(value)
-        properties = ps.get(feature)
+        properties = ps.get(f)
         
         for p in properties:
 
@@ -329,8 +329,8 @@ def __handle_flag_value (manager, value, ps):
                 # specially -- each &&-separated element is considered
                 # separate value. This is needed to handle searched
                 # libraries, which must be in specific order.
-                if not __re_two_ampersands.search (ungristed):
-                    values.append (ungristed)
+                if not __re_two_ampersands.search(value):
+                    values.append(value)
 
                 else:
                     values.extend(value.split ('&&'))
diff --git a/src/build/virtual_target.py b/src/build/virtual_target.py
index c58455a87..61706ddf9 100644
--- a/src/build/virtual_target.py
+++ b/src/build/virtual_target.py
@@ -746,6 +746,7 @@ class Action:
 
         ps = self.properties ()
         properties = self.adjust_properties (ps)
+
         actual_targets = []
         
         for i in self.targets ():