diff --git a/core/src/main/java/hudson/matrix/Layouter.java b/core/src/main/java/hudson/matrix/Layouter.java
index ca547790196891151116a4faf7b0782cd0ab998a..474f3b0045bbdad95341317a19c7a29b8715555f 100644
--- a/core/src/main/java/hudson/matrix/Layouter.java
+++ b/core/src/main/java/hudson/matrix/Layouter.java
@@ -112,7 +112,7 @@ public abstract class Layouter<T> {
     }
 
     /**
-     * Computes the width of n-th X-axis.
+     * Computes the width of n-th Y-axis.
      */
     public int height(int n) {
         return calc(y,n);
diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java
index b1aec5eeb5f31310baef5f48bbccbd2bad14ab59..046502c4381668a123b30e2ce6a140266e4e7159 100644
--- a/core/src/main/java/hudson/matrix/MatrixBuild.java
+++ b/core/src/main/java/hudson/matrix/MatrixBuild.java
@@ -53,6 +53,8 @@ import org.kohsuke.stapler.StaplerResponse;
  * @author Kohsuke Kawaguchi
  */
 public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
+    private AxisList axes;
+
     public MatrixBuild(MatrixProject job) throws IOException {
         super(job);
     }
@@ -65,6 +67,13 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
         super(project, buildDir);
     }
 
+    public Object readResolve() {
+        // MatrixBuild.axes added in 1.285; default to parent axes for old data
+        if (axes==null)
+            axes = getParent().getAxes();
+        return this;
+    }
+
     /**
      * Used by view to render a ball for {@link MatrixRun}.
      */
@@ -83,7 +92,7 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
     }
 
     public Layouter<RunPtr> getLayouter() {
-        return new Layouter<RunPtr>(getParent().getAxes()) {
+        return new Layouter<RunPtr>(axes) {
             protected RunPtr getT(Combination c) {
                 return new RunPtr(c);
             }
@@ -114,7 +123,7 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
         try {
             MatrixRun item = getRun(Combination.fromString(token));
             if(item!=null)
-            return item;
+                return item;
         } catch (IllegalArgumentException _) {
             // failed to parse the token as Combination. Must be something else
         }
@@ -161,6 +170,7 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
                 }
             }
 
+            axes = p.getAxes();
             Collection<MatrixConfiguration> activeConfigurations = p.getActiveConfigurations();
             final int n = getNumber();
 
diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
index 38b2333fdd7236a65b9235629a95ee90741f0ff8..5b56d89a35216d7226370cb82f89bc8e7d4bff94 100644
--- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
@@ -29,13 +29,13 @@ THE SOFTWARE.
   <l:ajax>
     <p:matrix autoRefresh="${it.isBuilding()}">
       <j:set var="b" value="${p.run}" />
-      <a href="${p.combination}" tooltip="${p.tooltip}">
+      <a href="${p.combination}/">
         <img src="${imagesURL}/24x24/${h.ifThenElse(b!=null,b.buildStatusUrl,'grey.gif')}"
-             title="${b.iconColor.description}" alt="${b.iconColor.description}"/>
+             tooltip="${p.tooltip}" alt="${p.tooltip}"/>
         <j:if test="${empty(o.x) and empty(o.y)}">
           ${p.combination.toString(o.z)}
         </j:if>
       </a>
     </p:matrix>
   </l:ajax>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
index fef44af7c8645333f7c995cfe5305efffc85e53d..fb91fc091af34cf93831e6b8a52efcd4b5c5ab4d 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
@@ -29,11 +29,11 @@ THE SOFTWARE.
   <l:ajax>
     <p:matrix autoRefresh="true">
       <a href="${p.shortUrl}">
-        <img src="${imagesURL}/24x24/${p.buildStatusUrl}" title="${p.iconColor.description}" alt="${p.iconColor.description}"/>
+        <img src="${imagesURL}/24x24/${p.buildStatusUrl}" tooltip="${p.iconColor.description}" alt="${p.iconColor.description}"/>
         <j:if test="${empty(o.x) and empty(o.y)}">
           ${p.combination.toString(o.z)}
         </j:if>
       </a>
     </p:matrix>
   </l:ajax>
-</j:jelly>
\ No newline at end of file
+</j:jelly>