diff --git a/Primitives.cpp b/Primitives.cpp
index e623978..b8d28a4 100644
--- a/Primitives.cpp
+++ b/Primitives.cpp
@@ -121,7 +121,7 @@ void MediaRectangle::update( float dt )
 
 LineStrip::LineStrip(std::vector<glm::vec3> points, glm::vec3 color)
 {
-    for(int i = 0; i < points.size(); ++i)
+    for(size_t i = 0; i < points.size(); ++i)
     {
         points_.push_back( points[i] );
         colors_.push_back( color );
diff --git a/Primitives.h b/Primitives.h
index 0fa7d60..527b993 100644
--- a/Primitives.h
+++ b/Primitives.h
@@ -14,7 +14,7 @@ class TexturedRectangle : public Primitive {
 public:
     TexturedRectangle(const std::string& resourcepath);
 
-    void draw(glm::mat4 modelview, glm::mat4 projection);
+    void draw(glm::mat4 modelview, glm::mat4 projection) override;
     void accept(Visitor& v) override { v.visit(*this);  }
 
     std::string getResourcePath() { return texturepath_; }
@@ -34,8 +34,8 @@ public:
     MediaRectangle(const std::string& mediapath);
     ~MediaRectangle();
 
-    void update ( float dt );
-    void draw(glm::mat4 modelview, glm::mat4 projection);
+    void update ( float dt ) override;
+    void draw(glm::mat4 modelview, glm::mat4 projection) override;
     void accept(Visitor& v) override { v.visit(*this); }
 
     std::string getMediaPath() { return mediapath_; }
diff --git a/Scene.h b/Scene.h
index f35c77b..6f46c0b 100644
--- a/Scene.h
+++ b/Scene.h
@@ -41,8 +41,8 @@ public:
     Primitive() : Node(), shader_(nullptr), vao_(0), arrayBuffer_(0), elementBuffer_(0), drawingPrimitive_(0) {}
     virtual ~Primitive();
 
-    virtual void init ();
-    virtual void draw ( glm::mat4 modelview, glm::mat4 projection);
+    virtual void init () override;
+    virtual void draw ( glm::mat4 modelview, glm::mat4 projection) override;
     virtual void accept(Visitor& v) override { v.visit(*this); }
 
     Shader *getShader() { return shader_; }
@@ -68,9 +68,9 @@ public:
     Group() : Node() {}
     virtual ~Group();
 
-    virtual void init ();
-    virtual void update ( float dt );
-    virtual void draw ( glm::mat4 modelview, glm::mat4 projection);
+    virtual void init () override;
+    virtual void update ( float dt ) override;
+    virtual void draw ( glm::mat4 modelview, glm::mat4 projection) override;
     virtual void accept(Visitor& v) override { v.visit(*this); }
 
     virtual void addChild ( Node *child );
diff --git a/Shader.cpp b/Shader.cpp
index 7f6c4c1..5256018 100644
--- a/Shader.cpp
+++ b/Shader.cpp
@@ -132,12 +132,12 @@ void ShadingProgram::checkCompileErr()
     glGetShaderiv(vertex_id_, GL_COMPILE_STATUS, &success);
     if (!success) {
         glGetShaderInfoLog(vertex_id_, 1024, NULL, infoLog);
-        Log::Warning("Error compiling Vertex ShadingProgram:\n%s \n%s", infoLog, vertex_code_);
+        Log::Warning("Error compiling Vertex ShadingProgram:\n%s \n%s", infoLog, vertex_code_.c_str());
     }
     glGetShaderiv(fragment_id_, GL_COMPILE_STATUS, &success);
 	if (!success) {
         glGetShaderInfoLog(fragment_id_, 1024, NULL, infoLog);
-        Log::Warning("Error compiling Fragment ShadingProgram:\n%s \n%s", infoLog, vertex_code_);
+        Log::Warning("Error compiling Fragment ShadingProgram:\n%s \n%s", infoLog, vertex_code_.c_str());
 	}
 }