diff --git a/src/geohash_helper.cpp b/src/geohash_helper.cpp
index e23f17b4e..5bc019628 100644
--- a/src/geohash_helper.cpp
+++ b/src/geohash_helper.cpp
@@ -46,13 +46,13 @@
 #define ECCENT (sqrt(1.0 - (RATIO *RATIO)))
 #define COM (0.5 * ECCENT)
 
-/// @brief The usual PI/180 constant
-const double DEG_TO_RAD = 0.017453292519943295769236907684886;
 /// @brief Earth's quatratic mean radius for WGS-84
 const double EARTH_RADIUS_IN_METERS = 6372797.560856;
 
 const double MERCATOR_MAX = 20037726.37;
+#if 0 //unused
 const double MERCATOR_MIN = -20037726.37;
+#endif
 
 static inline double deg_rad(double ang) { return ang * D_R; }
 static inline double rad_deg(double ang) { return ang / D_R; }
diff --git a/src/server.h b/src/server.h
index f48039e46..c4781d1e8 100644
--- a/src/server.h
+++ b/src/server.h
@@ -1042,7 +1042,7 @@ typedef struct clientReplyBlock {
 struct dictEntry;
 class dict_const_iter
 {
-    friend class redisDb;
+    friend struct redisDb;
     friend class redisDbPersistentData;
 protected:
     dictEntry *de;
diff --git a/src/t_set.cpp b/src/t_set.cpp
index 0c97c8d79..67ce89d08 100644
--- a/src/t_set.cpp
+++ b/src/t_set.cpp
@@ -219,9 +219,9 @@ int setTypeRandomElement(robj *setobj, sds *sdsele, int64_t *llele) {
     return setobj->encoding;
 }
 
-int setTypeRandomElement(robj_roptr setobj, const char **sdsele, const int64_t *llele)
+int setTypeRandomElement(robj_roptr setobj, const char **sdsele, int64_t *llele)
 {
-    return setTypeRandomElement(setobj.unsafe_robjcast(), (sds*)sdsele, const_cast<int64_t*>(llele));
+    return setTypeRandomElement(setobj.unsafe_robjcast(), (sds*)sdsele, llele);
 }
 
 unsigned long setTypeSize(robj_roptr subject) {