diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
index d10d30e8a..60f9fd963 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
@@ -156,7 +156,7 @@ public Call createCall(Contact callee) throws OperationFailedException
      * @throws OperationFailedException if initializing the new outgoing
      * <tt>Call</tt> fails
      */
-    synchronized CallSipImpl createOutgoingCall()
+    protected synchronized CallSipImpl createOutgoingCall()
         throws OperationFailedException
     {
         assertRegistered();
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
index 430f75f94..ae3964c6f 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
@@ -104,14 +104,10 @@ public AccountID installAccount( String userIDStr,
 
         accountProperties.put(USER_ID, userIDStr);
 
-        // serverAddress == null is OK because of registrarless support
-        String serverAddress = accountProperties.get(SERVER_ADDRESS);
-
         if (!accountProperties.containsKey(PROTOCOL))
             accountProperties.put(PROTOCOL, ProtocolNames.SIP);
 
-        AccountID accountID =
-            new SipAccountID(userIDStr, accountProperties, serverAddress);
+        AccountID accountID = createAccountID(userIDStr, accountProperties);
 
         //make sure we haven't seen this account id before.
         if( registeredAccounts.containsKey(accountID) )
@@ -271,6 +267,7 @@ public void modifyAccount(  ProtocolProviderService protocolProvider,
     @Override
     protected AccountID createAccountID(String userID, Map<String, String> accountProperties)
     {
+        // serverAddress == null is OK because of registrarless support
         String serverAddress = accountProperties.get(SERVER_ADDRESS);
 
         return new SipAccountID(userID, accountProperties, serverAddress);
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
index 45a3c054d..216417af0 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
@@ -76,6 +76,19 @@ public static SessionDescription parseSdpString(String sdp)
         }
     }
 
+    /**
+     * Creates an Attribute object with the specified values.
+     *
+     * @param name the name of the attribute
+     * @param value the value of the attribute 
+     *
+     * @return Attribute
+     */
+    public static Attribute createAttribute(String name, String value)
+    {
+        return sdpFactory.createAttribute(name, value);
+    }
+
     /**
      * Creates an empty instance of a <tt>SessionDescription</tt> with
      * preinitialized  <tt>s</tt>, <tt>v</tt>, <tt>c</tt>, <tt>o</tt> and
@@ -1544,6 +1557,7 @@ public static MediaType getMediaType(MediaDescription description)
      * @throws IllegalArgumentException if <tt>description</tt> does not
      * contain a known media type.
      */
+    @SuppressWarnings("unchecked") // legacy jain-sdp code
     public static boolean containsAttribute(MediaDescription description,
                                             String attributeName)
         throws  IllegalArgumentException
diff --git a/src/net/java/sip/communicator/launcher/SIPCommunicator.java b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
index 1cb561100..ae9e42045 100644
--- a/src/net/java/sip/communicator/launcher/SIPCommunicator.java
+++ b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
@@ -151,7 +151,7 @@ else if(lockResult == SipCommunicatorLock.SUCCESS)
      * @param osName the name of the OS according to which the SC_HOME_DIR_*
      *            properties are to be set
      */
-    private static void setScHomeDir(String osName)
+    static void setScHomeDir(String osName)
     {
         /*
          * Though we'll be setting the SC_HOME_DIR_* property values depending
diff --git a/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf b/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
index cbac12c02..639c643bc 100644
--- a/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
+++ b/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
@@ -46,6 +46,8 @@ Import-Package: org.xml.sax,
 Export-Package: net.java.sip.communicator.service.httputil,
  org.apache.http,
  org.apache.http.entity,
+ org.apache.http.entity.mime,
+ org.apache.http.entity.mime.content,
  org.apache.http.impl,
  org.apache.http.impl.entity,
  org.apache.http.impl.io,