diff --git a/gui-builder/src/GuiBuilder.cpp b/gui-builder/src/GuiBuilder.cpp
index 51c05745..8fe5d6db 100644
--- a/gui-builder/src/GuiBuilder.cpp
+++ b/gui-builder/src/GuiBuilder.cpp
@@ -1476,10 +1476,10 @@ void GuiBuilder::addPropertyValueTextStyle(const std::string& property, const sf
         auto checkBoxStrikeThrough = textStyleWindow->get<tgui::CheckBox>("CheckBoxStrikeThrough");
 
         unsigned int style = tgui::Deserializer::deserialize(tgui::ObjectConverter::Type::TextStyle, value).getTextStyle();
-        checkBoxBold->setChecked(style & sf::Text::Style::Bold);
-        checkBoxItalic->setChecked(style & sf::Text::Style::Italic);
-        checkBoxUnderlined->setChecked(style & sf::Text::Style::Underlined);
-        checkBoxStrikeThrough->setChecked(style & sf::Text::Style::StrikeThrough);
+        checkBoxBold->setChecked((style & sf::Text::Style::Bold) != 0);
+        checkBoxItalic->setChecked((style & sf::Text::Style::Italic) != 0);
+        checkBoxUnderlined->setChecked((style & sf::Text::Style::Underlined) != 0);
+        checkBoxStrikeThrough->setChecked((style & sf::Text::Style::StrikeThrough) != 0);
 
         auto updateTextStyleProperty = [=]{
             unsigned int newStyle = 0;
diff --git a/include/TGUI/nanosvg/README.txt b/include/TGUI/nanosvg/README.txt
index 1b0d7718..cb2eb4a5 100644
--- a/include/TGUI/nanosvg/README.txt
+++ b/include/TGUI/nanosvg/README.txt
@@ -1 +1 @@
-This folder contains the [nanosvg](https://github.com/memononen/nanosvg) headers (commit c1f6e20, downloaded in March 2019). Only minor changes were made to get rid of compiler warnings.
+This folder contains the [texus/nanosvg](https://github.com/texus/nanosvg) headers, which contain only minor changes to the official [memononen/nanosvg](https://github.com/memononen/nanosvg) library.
diff --git a/include/TGUI/nanosvg/nanosvg.h b/include/TGUI/nanosvg/nanosvg.h
index 94fe4f16..85316650 100644
--- a/include/TGUI/nanosvg/nanosvg.h
+++ b/include/TGUI/nanosvg/nanosvg.h
@@ -804,7 +804,6 @@ static double nsvg__convertToPixels(NSVGparser* p, NSVGcoordinate c, double orig
 		case NSVG_UNITS_PERCENT:	return orig + c.value / 100.0 * length;
 		default:					return c.value;
 	}
-	return c.value;
 }
 
 static NSVGgradientData* nsvg__findGradientData(NSVGparser* p, const char* id)