diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index a32437e692..eb0acd5754 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -31,7 +31,7 @@ class Animation{
 	
 	//Only shapes with morphing data will need a shape number
 	int shapeNumber;
-	std::vector<std::vector<int>> shapeIndexI;
+	std::vector<std::vector<int> > shapeIndexI;
 
 	//Ogre::SkeletonInstance* skel;
      std::vector<Nif::NiTriShapeCopy>* shapes;          //All the NiTriShapeData for this creature
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 65b1a93007..9dcbce9a33 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -18,7 +18,7 @@ class NpcAnimation: public Animation{
     std::vector<Ogre::Entity*> entityparts;
     Ogre::Entity* hand;
     Ogre::SceneNode* insert;
-    std::vector<std::vector<Nif::NiTriShapeCopy>*> shapeparts;   //All the NiTriShape data that we need for animating this particular npc
+    std::vector<std::vector<Nif::NiTriShapeCopy>* > shapeparts;   //All the NiTriShape data that we need for animating this particular npc
     public:
      NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend);
      ~NpcAnimation();
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 47ecfdd2c7..898dd22836 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -429,9 +429,9 @@ class NiMorphData : public Record
 	float startTime;
 	float stopTime;
 	std::vector<Ogre::Vector3> initialVertices;
-	std::vector<std::vector<float>> relevantTimes;
-	std::vector<std::vector<Ogre::Vector3>> relevantData;
-	std::vector<std::vector<Ogre::Vector3>> additionalVertices;
+	std::vector<std::vector<float> > relevantTimes;
+	std::vector<std::vector<Ogre::Vector3> > relevantData;
+	std::vector<std::vector<Ogre::Vector3> > additionalVertices;
 
 
 public:
@@ -457,7 +457,7 @@ public:
 	  std::vector<std::vector<float>> getRelevantTimes(){
 			return relevantTimes;
 	  }
-	   std::vector<std::vector<Ogre::Vector3>> getAdditionalVertices(){
+	   std::vector<std::vector<Ogre::Vector3> > getAdditionalVertices(){
 			return additionalVertices;
 	  }
 	  
diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp
index e3765fd610..62074f2f9e 100644
--- a/components/nifogre/ogre_nif_loader.cpp
+++ b/components/nifogre/ogre_nif_loader.cpp
@@ -1250,7 +1250,7 @@ void NIFLoader::loadResource(Resource *resource)
 		        Nif::Node *o = dynamic_cast<Nif::Node*>(f->target.getPtr());
 		        Nif::NiKeyframeDataPtr data = f->data;
 		
-		        if (f->timeStart == FLT_MAX)
+		        if (f->timeStart == 10000000000000000)
 			        continue;
 		        data->setBonename(o->name.toString());
 		        data->setStartTime(f->timeStart);
diff --git a/components/nifogre/ogre_nif_loader.hpp b/components/nifogre/ogre_nif_loader.hpp
index c979685101..e9caf8d112 100644
--- a/components/nifogre/ogre_nif_loader.hpp
+++ b/components/nifogre/ogre_nif_loader.hpp
@@ -31,6 +31,7 @@
 #include    <boost/algorithm/string.hpp>
 #include <Ogre.h>
 #include <stdio.h>
+#include <iostream>
 
 #include <libs/mangle/vfs/servers/ogre_vfs.hpp>
 #include "../nif/nif_file.hpp"