diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
index f1a8241dc4..e041e5ad97 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
@@ -149,10 +149,11 @@ public boolean onTouch(View v, MotionEvent event) {
                         if (mChart.isPinchZoomEnabled()) {
                             mTouchMode = PINCH_ZOOM;
                         } else {
-                            if (mSavedXDist > mSavedYDist)
-                                mTouchMode = X_ZOOM;
-                            else
-                                mTouchMode = Y_ZOOM;
+                            if (mChart.isScaleXEnabled() != mChart.isScaleYEnabled()) {
+                                mTouchMode = mChart.isScaleXEnabled() ? X_ZOOM : Y_ZOOM;
+                            } else {
+                                mTouchMode = mSavedXDist > mSavedYDist ? X_ZOOM : Y_ZOOM;
+                            }
                         }
                     }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java
index 8f1b41a7dd..530e282a26 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java
@@ -229,7 +229,7 @@ protected void drawDataSet(Canvas c, IPieDataSet dataSet) {
         int visibleAngleCount = 0;
         for (int j = 0; j < entryCount; j++) {
             // draw only if the value is greater than zero
-            if ((Math.abs(dataSet.getEntryForIndex(j).getY()) > 0.000001)) {
+            if ((Math.abs(dataSet.getEntryForIndex(j).getY()) > Utils.FLOAT_EPSILON)) {
                 visibleAngleCount++;
             }
         }
@@ -244,7 +244,7 @@ protected void drawDataSet(Canvas c, IPieDataSet dataSet) {
             Entry e = dataSet.getEntryForIndex(j);
 
             // draw only if the value is greater than zero
-            if ((Math.abs(e.getY()) > 0.000001)) {
+            if ((Math.abs(e.getY()) > Utils.FLOAT_EPSILON)) {
 
                 if (!mChart.needsHighlight(j)) {
 
@@ -265,7 +265,7 @@ protected void drawDataSet(Canvas c, IPieDataSet dataSet) {
 
                     float arcStartPointX = 0.f, arcStartPointY = 0.f;
 
-                    if (sweepAngleOuter % 360f < Utils.FLOAT_EPSILON) {
+                    if (sweepAngleOuter % 360f <= Utils.FLOAT_EPSILON) {
                         // Android is doing "mod 360"
                         mPathBuffer.addCircle(center.x, center.y, radius, Path.Direction.CW);
                     } else {
@@ -771,7 +771,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             int visibleAngleCount = 0;
             for (int j = 0; j < entryCount; j++) {
                 // draw only if the value is greater than zero
-                if ((Math.abs(set.getEntryForIndex(j).getY()) > 0.000001)) {
+                if ((Math.abs(set.getEntryForIndex(j).getY()) > Utils.FLOAT_EPSILON)) {
                     visibleAngleCount++;
                 }
             }
@@ -958,7 +958,7 @@ protected void drawRoundedSlices(Canvas c) {
             Entry e = dataSet.getEntryForIndex(j);
 
             // draw only if the value is greater than zero
-            if ((Math.abs(e.getY()) > 0.000001)) {
+            if ((Math.abs(e.getY()) > Utils.FLOAT_EPSILON)) {
 
                 float x = (float) ((r - circleRadius)
                         * Math.cos(Math.toRadians((angle + sliceAngle)