diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 983c51f137b..f2d09527a32 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -1255,7 +1255,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
 					0,
 					0,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1272,7 +1272,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
 					0,
 					0,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1289,7 +1289,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
 					r->in.info.info2->max_users,
 					0,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1306,7 +1306,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
 					0,
 					r->in.info.info501->csc_policy,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1323,7 +1323,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
 					r->in.info.info502->max_users,
 					0,
 					r->in.info.info502->sd);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1340,7 +1340,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
 					0,
 					0,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index e32f620e5b6..12829238363 100644
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -527,7 +527,7 @@ static WERROR winreg_GetVersion(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 	DCESRV_PULL_HANDLE_FAULT(h, r->in.handle, HTYPE_REGKEY);
 
 	r->out.version = talloc(mem_ctx, uint32_t);
-	NT_STATUS_HAVE_NO_MEMORY(r->out.version);
+	W_ERROR_HAVE_NO_MEMORY(r->out.version);
 
 	*r->out.version = 5;
 
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 3643a854857..7366d372fec 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -61,7 +61,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
 		return 0;
 	}
 
-	if(!W_ERROR_IS_OK(r.out.hr)) {
+	if(!W_ERROR_IS_OK(*r.out.hr)) {
 		fprintf(stderr, "RemoteActivation: %s\n", win_errstr(*r.out.hr));
 		return 0;
 	}