Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 5791)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 5792)
@@ -253,5 +253,5 @@
             cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
         }
-        for(String p : targetPrimitive.getDiscardableKeys()) {
+        for(String p : OsmPrimitive.getDiscardableKeys()) {
             if (targetPrimitive.get(p) != null) {
                 cmds.add(new ChangePropertyCommand(targetPrimitive, p, null));
Index: /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 5791)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 5792)
@@ -463,5 +463,5 @@
      */
     static public void setMaxWorkers() {
-        JobDispatcher.getInstance().setMaxWorkers(PROP_TMS_JOBS.get());
+        JobDispatcher.setMaxWorkers(PROP_TMS_JOBS.get());
         JobDispatcher.getInstance().setLIFO(true);
     }
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 5791)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 5792)
@@ -511,5 +511,5 @@
                     }
                 });
-                pnl.add(releasebutton, GBC.std().eol());
+                pnl.add(releasebutton, GBC.eol());
                 value = pnl;
             }