diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d73e33..1c61a75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_policy(VERSION 3.0)
 
 project (LearnOpenGL)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17) # this does nothing for MSVC, use target_compile_options below
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 
@@ -212,7 +212,7 @@ function(create_project_from_sources chapter demo)
     add_executable(${NAME} ${SOURCE})
     target_link_libraries(${NAME} ${LIBS})
     if(MSVC)
-		target_compile_options(${NAME} PRIVATE /std:c++latest /MP)
+		target_compile_options(${NAME} PRIVATE /std:c++17 /MP)
         target_link_options(${NAME} PUBLIC /ignore:4099)
     endif(MSVC)
     if(WIN32)
diff --git a/includes/learnopengl/animator.h b/includes/learnopengl/animator.h
index 6364f41..b0b1b27 100644
--- a/includes/learnopengl/animator.h
+++ b/includes/learnopengl/animator.h
@@ -11,7 +11,7 @@
 class Animator
 {
 public:
-	Animator::Animator(Animation* animation)
+	Animator(Animation* animation)
 	{
 		m_CurrentTime = 0.0;
 		m_CurrentAnimation = animation;
diff --git a/src/8.guest/2021/1.scene/1.scene_graph/scene_graph.cpp b/src/8.guest/2021/1.scene/1.scene_graph/scene_graph.cpp
index 313d70e..5d4405d 100644
--- a/src/8.guest/2021/1.scene/1.scene_graph/scene_graph.cpp
+++ b/src/8.guest/2021/1.scene/1.scene_graph/scene_graph.cpp
@@ -98,7 +98,7 @@ int main()
 
 	// load entities
 	// -----------
-	Entity ourEntity(FileSystem::getPath("resources/objects/planet/planet.obj"));
+	Entity ourEntity(Model(FileSystem::getPath("resources/objects/planet/planet.obj")));
 	ourEntity.transform.setLocalPosition({ 10, 0, 0 });
 	const float scale = 0.75;
 	ourEntity.transform.setLocalScale({ scale, scale, scale });
@@ -108,7 +108,7 @@ int main()
 
 		for (unsigned int i = 0; i < 10; ++i)
 		{
-			lastEntity->addChild(FileSystem::getPath("resources/objects/planet/planet.obj"));
+			lastEntity->addChild(Model(FileSystem::getPath("resources/objects/planet/planet.obj")));
 			lastEntity = lastEntity->children.back().get();
 
 			//Set tranform values
@@ -154,7 +154,7 @@ int main()
 		while (lastEntity->children.size())
 		{
 			ourShader.setMat4("model", lastEntity->transform.getModelMatrix());
-			lastEntity->Draw(ourShader);
+			lastEntity->pModel->Draw(ourShader);
 			lastEntity = lastEntity->children.back().get();
 		}