diff --git a/GLFT_Font.cpp b/GLFT_Font.cpp
index 929687b..59e7946 100644
--- a/GLFT_Font.cpp
+++ b/GLFT_Font.cpp
@@ -146,8 +146,8 @@ void GLFT_Font::open(const std::string& filename, unsigned int size)
         lineSpace -= widths_[ch];
 
         maxAscent = std::max(face->glyph->bitmap_top, maxAscent);
-        maxDescent = std::max(face->glyph->bitmap.rows -
-                                face->glyph->bitmap_top, maxDescent);
+        maxDescent = std::max((int)face->glyph->bitmap.rows -
+                                (int)face->glyph->bitmap_top, maxDescent);
     }
 
     height_ = maxAscent + maxDescent;   // calculate height_ for text
diff --git a/Makefile b/Makefile
index 42077dc..d04b8c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 UNAME := $(shell uname)
 
-ifeq ($(UNAME), Darwix)
+ifeq ($(UNAME), Darwin)
 	GL := -framework OpenGL
 else
 	GL := -lGL -lXrandr