diff --git a/src/engine/api/geary-endpoint.vala b/src/engine/api/geary-endpoint.vala
index 14121dca..1be7b856 100644
--- a/src/engine/api/geary-endpoint.vala
+++ b/src/engine/api/geary-endpoint.vala
@@ -44,7 +44,6 @@ public class Geary.Endpoint : BaseObject {
     public Flags flags { get; private set; }
     public uint timeout_sec { get; private set; }
     public TlsCertificateFlags tls_validation_flags { get; set; default = TlsCertificateFlags.VALIDATE_ALL; }
-    public bool force_ssl3 { get; set; default = false; }
 
     /**
      * The maximum number of commands that will be pipelined at once.
@@ -169,7 +168,6 @@ public class Geary.Endpoint : BaseObject {
     }
     
     private void prepare_tls_cx(TlsClientConnection tls_cx, bool starttls) {
-        tls_cx.use_ssl3 = force_ssl3;
         tls_cx.set_validation_flags(tls_validation_flags);
         
         // Vala doesn't do delegates in a ternary operator very well
@@ -178,7 +176,7 @@ public class Geary.Endpoint : BaseObject {
         else
             tls_cx.accept_certificate.connect(on_accept_ssl_certificate);
     }
-    
+
     private bool on_accept_starttls_certificate(TlsConnection cx, TlsCertificate cert, TlsCertificateFlags flags) {
         return report_tls_warnings(SecurityType.STARTTLS, cx, cert, flags);
     }
diff --git a/src/sqlite3-unicodesn/fts3_unicode2.c b/src/sqlite3-unicodesn/fts3_unicode2.c
index 2863c713..0ee120c2 100644
--- a/src/sqlite3-unicodesn/fts3_unicode2.c
+++ b/src/sqlite3-unicodesn/fts3_unicode2.c
@@ -132,7 +132,7 @@ int sqlite3FtsUnicodeIsalnum(int c){
     return ( (aAscii[c >> 5] & (1 << (c & 0x001F)))==0 );
   }else if( c<(1<<22) ){
     unsigned int key = (((unsigned int)c)<<10) | 0x000003FF;
-    int iRes;
+    int iRes= 0;
     int iHi = sizeof(aEntry)/sizeof(aEntry[0]) - 1;
     int iLo = 0;
     while( iHi>=iLo ){