diff --git a/server/src/main/java/io/druid/db/DatabaseRuleManager.java b/server/src/main/java/io/druid/db/DatabaseRuleManager.java
index 0ba44c52c85..036acda23d6 100644
--- a/server/src/main/java/io/druid/db/DatabaseRuleManager.java
+++ b/server/src/main/java/io/druid/db/DatabaseRuleManager.java
@@ -207,7 +207,7 @@ public class DatabaseRuleManager
                       String.format(
                           "SELECT r.dataSource, r.payload "
                           + "FROM %1$s r "
-                          + "INNER JOIN(SELECT dataSource, max(version) as version, payload FROM %1$s GROUP BY dataSource) ds "
+                          + "INNER JOIN(SELECT dataSource, max(version) as version FROM %1$s GROUP BY dataSource) ds "
                           + "ON r.datasource = ds.datasource and r.version = ds.version",
                           getRulesTable()
                       )
diff --git a/server/src/main/java/io/druid/db/DatabaseSegmentManager.java b/server/src/main/java/io/druid/db/DatabaseSegmentManager.java
index 203d082b806..3d68ad46978 100644
--- a/server/src/main/java/io/druid/db/DatabaseSegmentManager.java
+++ b/server/src/main/java/io/druid/db/DatabaseSegmentManager.java
@@ -213,7 +213,7 @@ public class DatabaseSegmentManager
               for (DataSegment segment : segments) {
                 batch.add(
                     String.format(
-                        "UPDATE %s SET used=1 WHERE id = '%s'",
+                        "UPDATE %s SET used=true WHERE id = '%s'",
                         getSegmentsTable(),
                         segment.getIdentifier()
                     )
@@ -244,7 +244,7 @@ public class DatabaseSegmentManager
             public Void withHandle(Handle handle) throws Exception
             {
               handle.createStatement(
-                  String.format("UPDATE %s SET used=1 WHERE id = :id", getSegmentsTable())
+                  String.format("UPDATE %s SET used=true WHERE id = :id", getSegmentsTable())
               )
                     .bind("id", segmentId)
                     .execute();
@@ -278,7 +278,7 @@ public class DatabaseSegmentManager
             public Void withHandle(Handle handle) throws Exception
             {
               handle.createStatement(
-                  String.format("UPDATE %s SET used=0 WHERE dataSource = :dataSource", getSegmentsTable())
+                  String.format("UPDATE %s SET used=false WHERE dataSource = :dataSource", getSegmentsTable())
               )
                     .bind("dataSource", ds)
                     .execute();
@@ -308,7 +308,7 @@ public class DatabaseSegmentManager
             public Void withHandle(Handle handle) throws Exception
             {
               handle.createStatement(
-                  String.format("UPDATE %s SET used=0 WHERE id = :segmentID", getSegmentsTable())
+                  String.format("UPDATE %s SET used=false WHERE id = :segmentID", getSegmentsTable())
               ).bind("segmentID", segmentID)
                     .execute();
 
@@ -408,7 +408,7 @@ public class DatabaseSegmentManager
             public List<Map<String, Object>> withHandle(Handle handle) throws Exception
             {
               return handle.createQuery(
-                  String.format("SELECT payload FROM %s WHERE used=1", getSegmentsTable())
+                  String.format("SELECT payload FROM %s WHERE used=true", getSegmentsTable())
               ).list();
             }
           }
@@ -465,4 +465,4 @@ public class DatabaseSegmentManager
   private String getSegmentsTable() {
     return dbTables.get().getSegmentsTable();
   }
-}
\ No newline at end of file
+}