diff --git a/build.gradle b/build.gradle
index 2020ad27a7730dc9c151241022b870f0e5f0859d..a7cff3a5984483a406288f9315744cff02289f89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,11 +95,11 @@ android {
     productFlavors {
         playstore {
             dimension "distribution"
-            versionNameSuffix "-p"
+            versionNameSuffix "+p"
         }
         free {
             dimension "distribution"
-            versionNameSuffix "-f"
+            versionNameSuffix "+f"
         }
         system {
             dimension "emoji"
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 37cae98e5d1870e97263e517144a31c92f6a03f9..297c3d0f4a0ea7de89d80c6c9b15f5c19f984178 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -2,7 +2,6 @@ package eu.siacs.conversations.entities;
 
 import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
-import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.Collections;