Index: /trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java	(revision 7292)
+++ /trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java	(revision 7293)
@@ -6,4 +6,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -35,3 +36,8 @@
         super.exitMode();
     }
+
+    @Override
+    public boolean layerIsSupported(Layer l) {
+        return Main.map.mapModeSelect.layerIsSupported(l);
+    }
 }
Index: /trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java	(revision 7292)
+++ /trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java	(revision 7293)
@@ -98,5 +98,5 @@
         }
         if (!modifierListeners.isEmpty()) {
-            Main.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), modifierListeners.toString());
+            Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
         }
         try {
@@ -160,5 +160,5 @@
      */
     public boolean isKeyPressed(int keyCode) {
-        return set.contains(Integer.valueOf(keyCode));
+        return set.contains(keyCode);
     }
 }