diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
index 93de9d7742..0dab654e2c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
@@ -175,7 +175,7 @@ public class CloudStackComputeServiceAdapter implements
       String templateId = template.getImage().getId();
       String serviceOfferingId = template.getHardware().getId();
 
-      logger.info("serviceOfferingId %s, templateId %s, zoneId %s, options %s%n", serviceOfferingId, templateId,
+      logger.debug("serviceOfferingId %s, templateId %s, zoneId %s, options %s%n", serviceOfferingId, templateId,
          zoneId, options);
       AsyncCreateResponse job = client.getVirtualMachineClient().deployVirtualMachineInZone(zoneId, serviceOfferingId,
          templateId, options);
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java
index e8f082fbde..462061811c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java
@@ -35,12 +35,12 @@ public class PublicIPAddressPredicates {
       private final String networkId;
 
       public AssociatedWithNetwork(String networkId) {
-         this.networkId = networkId;
+         this.networkId = checkNotNull(networkId, "networkId");
       }
 
       @Override
       public boolean apply(PublicIPAddress input) {
-         return checkNotNull(input, "ipaddress").getAssociatedNetworkId().equals(networkId);
+         return networkId.equals(checkNotNull(input, "ipaddress").getAssociatedNetworkId());
       }
 
       @Override
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java
index fa564fc422..7c0ef86c22 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java
@@ -26,7 +26,6 @@ import javax.annotation.Resource;
 import javax.inject.Inject;
 
 import org.jclouds.cloudstack.CloudStackClient;
-import org.jclouds.cloudstack.domain.Account;
 import org.jclouds.cloudstack.domain.User;
 import org.jclouds.cloudstack.predicates.UserPredicates;
 import org.jclouds.logging.Logger;
@@ -66,9 +65,6 @@ public class GetCurrentUser implements Supplier<User> {
                users));
       }
 
-      if (currentUser.getAccountType() != Account.Type.USER) {
-         logger.warn("Expecting an user account: %s", currentUser);
-      }
       return currentUser;
    }
 }