diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5cccb365..64132a6c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -111,7 +111,7 @@
 
     <string name="setup_add_account">Afegir compte</string>
     <string name="setup_querying_server">Contactant servidor. Espereu sisuplau.</string>
-    <string name="setup_what_to_sync">Quines col·leccions s'han de sincronitzar?</string>
+    <string name="setup_what_to_sync">Quines col·leccions s\'han de sincronitzar?</string>
     <string name="setup_address_books">Llibretes de contactes</string>
     <string name="setup_address_book">Llibreta de contactes</string>
     <string name="setup_calendars">Calendaris</string>
@@ -136,7 +136,7 @@
     <string name="settings_network_logging">Registra el tràfic de xarxa</string>
     <string name="settings_network_logging_enabled">Tot el tràfic de xarxa es reigstra (mode depuració)</string>
     <string name="settings_network_logging_disabled">No es registra el tràfic de xarxa</string>
-    <string name="settings_report_an_issue">Informa d'un error</string>
+    <string name="settings_report_an_issue">Informa d\'un error</string>
 
 
 </resources>
diff --git a/src/at/bitfire/davdroid/resource/DavResourceFinder.java b/src/at/bitfire/davdroid/resource/DavResourceFinder.java
index 76e330d5..843ac2d0 100644
--- a/src/at/bitfire/davdroid/resource/DavResourceFinder.java
+++ b/src/at/bitfire/davdroid/resource/DavResourceFinder.java
@@ -202,12 +202,14 @@ public class DavResourceFinder implements Closeable {
 				records = new Lookup(name, Type.TXT).run();
 				if (records != null && records.length >= 1) {
 					TXTRecord txt = (TXTRecord)records[0];
-					for (String segment : (String[])txt.getStrings().toArray())
+					for (Object o : txt.getStrings().toArray()) {
+						String segment = (String)o;
 						if (segment.startsWith("path=")) {
 							path = segment.substring(5);
 							Log.d(TAG, "Found initial context path for " + serviceName + " at " + domain + " -> " + path);
 							break;
 						}
+					}
 				}
 			}
 		} catch (TextParseException e) {
@@ -234,7 +236,6 @@ public class DavResourceFinder implements Closeable {
 		if (initialURL != null) {
 			// determine base URL (host name and initial context path)
 			WebDavResource base = new WebDavResource(httpClient,
-					//new URI(URIUtils.ensureTrailingSlash(serverInfo.getBaseURI())),
 					initialURL,
 					serverInfo.getUserName(), serverInfo.getPassword(), serverInfo.isAuthPreemptive());