diff --git a/core/src/main/java/hudson/model/Build.java b/core/src/main/java/hudson/model/Build.java
index 02ab4ffedd93a0b8a28efd7ae11338017691722a..0fce241495e56881543cd61c995f0d69e96c090a 100644
--- a/core/src/main/java/hudson/model/Build.java
+++ b/core/src/main/java/hudson/model/Build.java
@@ -85,14 +85,14 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
             try {
                 List<BuildWrapper> wrappers = new ArrayList<BuildWrapper>(project.getBuildWrappers().values());
                 
-                for (NodeProperty nodeProperty: Hudson.getInstance().getGlobalNodeProperties()) {
+                for (NodeProperty<?> nodeProperty: Hudson.getInstance().getGlobalNodeProperties()) {
                     Environment environment = nodeProperty.setUp(Build.this, launcher, listener);
                     if (environment != null) {
                         buildEnvironments.add(environment);
                     }
                 }
 
-                for (NodeProperty nodeProperty: Computer.currentComputer().getNode().getNodeProperties()) {
+                for (NodeProperty<?> nodeProperty: Computer.currentComputer().getNode().getNodeProperties()) {
                     Environment environment = nodeProperty.setUp(Build.this, launcher, listener);
                     if (environment != null) {
                         buildEnvironments.add(environment);
@@ -104,7 +104,7 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
                     parameters.createBuildWrappers(Build.this,wrappers);
 
                 for( BuildWrapper w : wrappers ) {
-                    Environment e = w.setUp((AbstractBuild)Build.this, launcher, listener);
+                    Environment e = w.setUp((AbstractBuild<?,?>)Build.this, launcher, listener);
                     if(e==null)
                         return Result.FAILURE;
                     buildEnvironments.add(e);