diff --git a/src/dlangui/core/editable.d b/src/dlangui/core/editable.d
index acbb2ea2..c1853981 100644
--- a/src/dlangui/core/editable.d
+++ b/src/dlangui/core/editable.d
@@ -24,6 +24,7 @@ import dlangui.core.linestream;
 import dlangui.core.streams;
 import std.algorithm;
 import std.conv : to;
+import std.uni;
 
 // uncomment FileFormats debug symbol to dump file formats for loaded/saved files.
 //debug = FileFormats;
@@ -1132,7 +1133,7 @@ class EditableContent {
     /// inserts count empty lines at specified position
     protected void insertLines(int start, int count)
     in { assert(count > 0); }
-    body {
+    do {
         _lines.length += count;
         _tokenProps.length = _lines.length;
         _editMarks.length = _lines.length;
diff --git a/src/dlangui/core/settings.d b/src/dlangui/core/settings.d
index 27d8f8ed..c21e8a8a 100644
--- a/src/dlangui/core/settings.d
+++ b/src/dlangui/core/settings.d
@@ -106,7 +106,7 @@ class SettingsFile {
 
     static string limitString(string value, const string[] values)
     in { assert(values.length > 0); }
-    body {
+    do {
         foreach(v; values)
             if (v.equal(value))
                 return value;
diff --git a/src/dlangui/graphics/ftfonts.d b/src/dlangui/graphics/ftfonts.d
index 8f6b75d9..b2fcd4d6 100644
--- a/src/dlangui/graphics/ftfonts.d
+++ b/src/dlangui/graphics/ftfonts.d
@@ -15,6 +15,7 @@ static if (ENABLE_FREETYPE):
 import dlangui.graphics.fonts;
 
 import derelict.freetype.ft;
+import derelict.util.exception;
 import dlangui.core.logger;
 import dlangui.core.collections;
 import std.algorithm;
diff --git a/src/dlangui/graphics/glsupport.d b/src/dlangui/graphics/glsupport.d
index 696bb86b..3232c134 100644
--- a/src/dlangui/graphics/glsupport.d
+++ b/src/dlangui/graphics/glsupport.d
@@ -49,6 +49,7 @@ version (Android) {
 } else {
     enum SUPPORT_LEGACY_OPENGL = false; //true;
     public import derelict.opengl;
+    import derelict.util.exception;
     //public import derelict.opengl.types;
     //public import derelict.opengl.versions.base;
     //public import derelict.opengl.versions.gl3x;
diff --git a/src/dlangui/platforms/sdl/sdlapp.d b/src/dlangui/platforms/sdl/sdlapp.d
index 0909c5a7..b3277455 100644
--- a/src/dlangui/platforms/sdl/sdlapp.d
+++ b/src/dlangui/platforms/sdl/sdlapp.d
@@ -44,6 +44,7 @@ import derelict.sdl2.sdl;
 static if (ENABLE_OPENGL) {
     //import derelict.opengl3.gl3;
     import derelict.opengl;
+    import derelict.util.exception;
     import dlangui.graphics.gldrawbuf;
     import dlangui.graphics.glsupport;
 }
diff --git a/src/dlangui/widgets/charts.d b/src/dlangui/widgets/charts.d
index fdcb7542..82fd3b44 100644
--- a/src/dlangui/widgets/charts.d
+++ b/src/dlangui/widgets/charts.d
@@ -384,7 +384,7 @@ class SimpleBarChart : Widget {
     protected Point measureAxisYDesc() {
         int maxDescWidth = _axisYMinDescWidth;
         double currentMaxValue = _maxY;
-        if (approxEqual(_maxY, 0, 0.0000001, 0.0000001))
+        if (isClose(_maxY, 0, 0.0000001, 0.0000001))
             currentMaxValue = 100;
 
         Point sz = font.textSize(to!dstring(currentMaxValue), MAX_WIDTH_UNSPECIFIED, 4, 0, textFlags);
@@ -400,7 +400,7 @@ class SimpleBarChart : Widget {
 
     protected int barYValueToPixels(int axisInPixels, double barYValue ) {
         double currentMaxValue = _maxY;
-        if (approxEqual(_maxY, 0, 0.0000001, 0.0000001))
+        if (isClose(_maxY, 0, 0.0000001, 0.0000001))
             currentMaxValue = 100;
 
         double pixValue = axisInPixels / currentMaxValue;
@@ -464,7 +464,7 @@ class SimpleBarChart : Widget {
 
         // segments on y axis and values (now only max and max/2)
         double currentMaxValue = _maxY;
-        if (approxEqual(_maxY, 0, 0.0000001, 0.0000001))
+        if (isClose(_maxY, 0, 0.0000001, 0.0000001))
             currentMaxValue = 100;
 
         int yZero = rc.bottom - _axisX.maxDescriptionSize.y - _axisX.segmentTagLength - _axisX.thickness - _axisY.zeroValueDist;