diff --git a/src/context.h b/src/context.h
index f9fea0666..148dc9506 100644
--- a/src/context.h
+++ b/src/context.h
@@ -88,9 +88,6 @@ private:
   // List of all documents.
   Documents m_documents;
 
-  // Active/selected document to operate.
-  Document* m_activeDocument;
-
   // Settings in this context.
   ISettings* m_settings;
 
diff --git a/src/raster/pen.cpp b/src/raster/pen.cpp
index da4a8ffe6..f0be446da 100644
--- a/src/raster/pen.cpp
+++ b/src/raster/pen.cpp
@@ -18,12 +18,12 @@
 
 #include "config.h"
 
-#include <math.h>
-
 #include "raster/algo.h"
 #include "raster/pen.h"
 #include "raster/image.h"
 
+#include <cmath>
+
 Pen::Pen()
 {
   m_type = PEN_TYPE_CIRCLE;
@@ -101,7 +101,7 @@ void Pen::regenerate_pen()
 
   int size = m_size;
   if (m_type == PEN_TYPE_SQUARE && m_angle != 0 && m_size > 2)
-    size = std::sqrt(2*m_size*m_size)+2;
+    size = std::sqrt((double)2*m_size*m_size)+2;
 
   m_image = Image::create(IMAGE_BITMAP, size, size);