diff --git a/source/Hyperspace-Extensions/ZnMimeType.extension.st b/source/Hyperspace-Extensions/ZnMimeType.extension.st
index c98a0bf..206b41e 100644
--- a/source/Hyperspace-Extensions/ZnMimeType.extension.st
+++ b/source/Hyperspace-Extensions/ZnMimeType.extension.st
@@ -3,9 +3,10 @@ Extension { #name : #ZnMimeType }
 { #category : #'*Hyperspace-Extensions' }
 ZnMimeType >> accepts: aMimeType [
 
-	^ (aMimeType main = '*' or: [ aMimeType main = self main ])
-		and: [ aMimeType sub = '*'
-				or: [ self sub = aMimeType sub or: [ (self sub splitOn: $+) includes: aMimeType sub ] ] ]
+	^ (aMimeType main = '*' or: [ aMimeType main = self main ]) and: [
+		  aMimeType sub = '*' or: [
+			  self sub = aMimeType sub or: [
+				  ($+ split: self sub) includes: aMimeType sub ] ] ]
 ]
 
 { #category : #'*Hyperspace-Extensions' }
diff --git a/source/Hyperspace-Model-Tests/ZnRequestHyperspaceExtensionsTest.class.st b/source/Hyperspace-Model-Tests/ZnRequestHyperspaceExtensionsTest.class.st
index 17fa8d0..ec3a205 100644
--- a/source/Hyperspace-Model-Tests/ZnRequestHyperspaceExtensionsTest.class.st
+++ b/source/Hyperspace-Model-Tests/ZnRequestHyperspaceExtensionsTest.class.st
@@ -69,7 +69,7 @@ ZnRequestHyperspaceExtensionsTest >> testQuery [
 
 	request := ZnRequest query: self googleUrl / 'search'.
 
-	self assert: request method equals: #QUERY.
+	self assert: request method equals: 'QUERY'.
 	output := String streamContents: [ :s | request writeOn: s ].
 
 	self
diff --git a/source/Hyperspace-Model/PortAvailabilityChecker.class.st b/source/Hyperspace-Model/PortAvailabilityChecker.class.st
index c20598e..53fa798 100644
--- a/source/Hyperspace-Model/PortAvailabilityChecker.class.st
+++ b/source/Hyperspace-Model/PortAvailabilityChecker.class.st
@@ -35,7 +35,7 @@ PortAvailabilityChecker >> isAvailableForTCP: portNumber [
 	^ [ 
 	  | socket |
 
-	  socket := Socket newTCP.
+	  socket := ZnNetworkingUtils default socketClass newTCP.
 	  ZnNetworkingUtils default setServerSocketOptions: socket.
 	  socket listenOn: portNumber.
 	  [ 
diff --git a/source/Hyperspace-Model/WebLink.class.st b/source/Hyperspace-Model/WebLink.class.st
index a675e67..6cd9a45 100644
--- a/source/Hyperspace-Model/WebLink.class.st
+++ b/source/Hyperspace-Model/WebLink.class.st
@@ -258,7 +258,8 @@ WebLink >> quoteValueWhenNeeded: aString [
 	"Values including ; or , needs to be quoted"
 
 	self assertNotEmpty: aString.
-	^ ( aString includesAnyOf: ';,' ) then: [ '"<1s>"' expandMacrosWith: aString ]
+	^ ((aString includes: $;) or: [ aString includes: $, ])
+		  then: [ '"<1s>"' expandMacrosWith: aString ]
 		  otherwise: [ aString ]
 ]
 
diff --git a/source/Hyperspace-Pharo-Extensions/ZnNetworkingUtils.extension.st b/source/Hyperspace-Pharo-Extensions/ZnNetworkingUtils.extension.st
new file mode 100644
index 0000000..0952402
--- /dev/null
+++ b/source/Hyperspace-Pharo-Extensions/ZnNetworkingUtils.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : #ZnNetworkingUtils }
+
+{ #category : #'*Hyperspace-Pharo-Extensions' }
+ZnNetworkingUtils >> socketClass [
+
+	^ Socket
+]