diff --git a/src/main/java/com/xebialabs/overthere/smb2/Smb2ConnectionBuilder.java b/src/main/java/com/xebialabs/overthere/smb2/Smb2ConnectionBuilder.java
index d25c37e9..5d31206c 100644
--- a/src/main/java/com/xebialabs/overthere/smb2/Smb2ConnectionBuilder.java
+++ b/src/main/java/com/xebialabs/overthere/smb2/Smb2ConnectionBuilder.java
@@ -48,7 +48,7 @@ public class Smb2ConnectionBuilder extends ConnectionBuilder implements Overther
     public static final String SMB2_PORT = "cifsPort";
 
     /**
-     * The Windows Domain to authenticate the user against. If not set, bla bla bla
+     * The Windows Domain to authenticate the user against. If not set blank value will be used
      */
     public static final String DOMAIN = "domain";
 
diff --git a/src/main/java/com/xebialabs/overthere/smb2/Smb2File.java b/src/main/java/com/xebialabs/overthere/smb2/Smb2File.java
index dc1ef447..6b9611c4 100644
--- a/src/main/java/com/xebialabs/overthere/smb2/Smb2File.java
+++ b/src/main/java/com/xebialabs/overthere/smb2/Smb2File.java
@@ -90,17 +90,17 @@ public boolean exists() {
 
     @Override
     public boolean canRead() {
-        return checkAccessMask(AccessMask.GENERIC_READ);
+        return checkAccessMask(AccessMask.FILE_READ_DATA);
     }
 
     @Override
     public boolean canWrite() {
-        return checkAccessMask(AccessMask.GENERIC_WRITE);
+        return checkAccessMask(AccessMask.FILE_APPEND_DATA);
     }
 
     @Override
     public boolean canExecute() {
-        return checkAccessMask(AccessMask.GENERIC_EXECUTE);
+        return canRead();
     }
 
     @Override
diff --git a/src/test/java/com/xebialabs/overthere/smb2/winrm/Smb2WinRmConnectionOverHttpWithAdministrativeUserItest.java b/src/test/java/com/xebialabs/overthere/smb2/winrm/Smb2WinRmConnectionOverHttpWithAdministrativeUserItest.java
index 2d62d844..e8a2ece0 100644
--- a/src/test/java/com/xebialabs/overthere/smb2/winrm/Smb2WinRmConnectionOverHttpWithAdministrativeUserItest.java
+++ b/src/test/java/com/xebialabs/overthere/smb2/winrm/Smb2WinRmConnectionOverHttpWithAdministrativeUserItest.java
@@ -60,6 +60,6 @@ protected ConnectionOptions getOptions() {
 
     @Override
     protected String getExpectedConnectionClassName() {
-        return CifsWinRmConnection.class.getName();
+        return Smb2WinRmConnection.class.getName();
     }
 }