diff --git a/biz.aQute.repository/src/aQute/bnd/deployer/http/HttpsUtil.java b/biz.aQute.repository/src/aQute/bnd/deployer/http/HttpsUtil.java
index 2e4980d9d5..6e751b6445 100644
--- a/biz.aQute.repository/src/aQute/bnd/deployer/http/HttpsUtil.java
+++ b/biz.aQute.repository/src/aQute/bnd/deployer/http/HttpsUtil.java
@@ -13,10 +13,13 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+@Deprecated
 public class HttpsUtil {
 
+	@Deprecated
 	public static final String PROP_DISABLE_SERVER_CERT_VERIFY = "disableServerVerify";
 
+	@Deprecated
 	static void disableServerVerification(URLConnection connection) throws GeneralSecurityException {
 		if (!(connection instanceof HttpsURLConnection))
 			return;
diff --git a/bndtools.core/src/bndtools/editor/completion/BndCompletionProcessor.java b/bndtools.core/src/bndtools/editor/completion/BndCompletionProcessor.java
index a572fd8999..a01951c1d8 100644
--- a/bndtools.core/src/bndtools/editor/completion/BndCompletionProcessor.java
+++ b/bndtools.core/src/bndtools/editor/completion/BndCompletionProcessor.java
@@ -18,7 +18,7 @@
 
 public class BndCompletionProcessor implements IContentAssistProcessor {
 
-	private static final Pattern PREFIX_PATTERN = Pattern.compile("^(?:.*\\s)*(.*)$");
+	private static final Pattern PREFIX_PATTERN = Pattern.compile("(\\S+)$");
 
 	@Override
 	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
@@ -26,7 +26,7 @@ public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int
 			String pre = viewer.getDocument()
 				.get(0, offset);
 			Matcher matcher = PREFIX_PATTERN.matcher(pre);
-			if (matcher.matches()) {
+			if (matcher.find()) {
 				String prefix = matcher.group(1);
 				ICompletionProposal[] found = proposals(prefix, offset);
 				if (found.length == 1) {
diff --git a/bndtools.jareditor/src/bndtools/jareditor/internal/JarFileSystem.java b/bndtools.jareditor/src/bndtools/jareditor/internal/JarFileSystem.java
index 93fbd40fe1..f38144e8eb 100644
--- a/bndtools.jareditor/src/bndtools/jareditor/internal/JarFileSystem.java
+++ b/bndtools.jareditor/src/bndtools/jareditor/internal/JarFileSystem.java
@@ -59,7 +59,7 @@ public class JarFileSystem extends FileSystem {
 	private final ConcurrentMap<IFileStore, Reference<JarRootNode>>	roots		= new ConcurrentHashMap<>();
 
 	private static final Pattern									JARF_P		= Pattern
-		.compile("jarf:///(?<fileuri>.*)!(?<path>(/[^!]*)+)");
+		.compile("jarf:///(?<fileuri>.*)!(?<path>/[^!]*)");
 
 	static abstract class JarNode extends FileStore {
 		private final JarFolderNode	parent;