diff --git a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
index 51c2503fbf..54b9936326 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
@@ -177,7 +177,7 @@ public class CIMOperatingSystem extends OperatingSystem {
 
    @Override
    public String toString() {
-      return String.format("[osType=%s, arch=%s, description=%s, family=%s, is64Bit=%s, name=%s, version=%s]", osType,
-               arch, description, family, is64Bit, name, version);
+      return "[name=" + name + ", family=" + family + ", version=" + version + ", arch=" + arch + ", is64Bit="
+               + is64Bit + ", description=" + description + ", osType=" + osType+ "]";
    }
 }
\ No newline at end of file
diff --git a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
index a5a02546d7..8135675c13 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
@@ -211,7 +211,7 @@ public class OperatingSystem {
          return true;
       if (obj == null)
          return false;
-      if (getClass() != obj.getClass())
+      if (!(obj instanceof OperatingSystem))
          return false;
       OperatingSystem other = (OperatingSystem) obj;
       if (arch == null) {