diff --git a/KREngine/kraken/KRModel.cpp b/KREngine/kraken/KRModel.cpp
index a7bd54e..f337aba 100644
--- a/KREngine/kraken/KRModel.cpp
+++ b/KREngine/kraken/KRModel.cpp
@@ -105,6 +105,17 @@ float KRModel::getRimPower()
     return m_rim_power;
 }
 
+void KRModel::setLightMap(const std::string &name)
+{
+    m_lightMap = name;
+    m_pLightMap = NULL;
+}
+
+std::string KRModel::getLightMap()
+{
+    return m_lightMap;
+}
+
 void KRModel::loadModel() {
     if(m_models.size() == 0) {
         std::vector<KRMesh *> models = m_pContext->getModelManager()->getModel(m_model_name.c_str()); // The model manager returns the LOD levels in sorted order, with the highest detail first
diff --git a/KREngine/kraken/KRModel.h b/KREngine/kraken/KRModel.h
index 25f46e0..3f8df27 100644
--- a/KREngine/kraken/KRModel.h
+++ b/KREngine/kraken/KRModel.h
@@ -66,6 +66,9 @@ public:
     KRVector3 getRimColor();
     float getRimPower();
     
+    void setLightMap(const std::string &name);
+    std::string getLightMap();
+    
 private:
     std::vector<KRMesh *> m_models;
     unordered_map<KRMesh *, std::vector<KRBone *> > m_bones; // Outer std::map connects model to set of bones
diff --git a/KREngine/kraken/KRResource+fbx.cpp b/KREngine/kraken/KRResource+fbx.cpp
index 4b1a7fd..23c9281 100644
--- a/KREngine/kraken/KRResource+fbx.cpp
+++ b/KREngine/kraken/KRResource+fbx.cpp
@@ -130,7 +130,7 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path)
     int animation_count = pFbxScene->GetSrcObjectCount<FbxAnimStack>();
     for(int i = 0; i < animation_count; i++) {
         FbxAnimStack *animation = pFbxScene->GetSrcObject<FbxAnimStack>(i);
-        KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "  Animation %i of %i: %s", i+1, animation_count, animation->GetName());
+        KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "  Animation %i of %i: %s", i+1, animation_count, animation->GetName().c_str());
         KRAnimation *new_animation = LoadAnimation(context, animation);
         if(new_animation) {
             context.getAnimationManager()->addAnimation(new_animation);
@@ -142,7 +142,7 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path)
     int curve_count = pFbxScene->GetSrcObjectCount<FbxAnimCurve>();
     for(int i=0; i < curve_count; i++) {
         FbxAnimCurve *curve = pFbxScene->GetSrcObject<FbxAnimCurve>(i);
-        KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "  Animation Curve %i of %i: %s", i+1, curve_count, curve->GetName());
+        KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "  Animation Curve %i of %i: %s", i+1, curve_count, curve->GetName().c_str());
         KRAnimationCurve *new_curve = LoadAnimationCurve(context, curve);
 
         if(new_curve) {
@@ -156,7 +156,7 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path)
     KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "\nLoading materials...");
     for(int i=0; i < material_count; i++) {
         FbxSurfaceMaterial *material = pFbxScene->GetSrcObject<FbxSurfaceMaterial>(i);
-        KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "  Material %i of %i: %s", i+1, material_count, material->GetName());
+        KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "  Material %i of %i: %s", i+1, material_count, material->GetName().c_str());
         LoadMaterial(context, material);
     }
     
@@ -166,7 +166,7 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path)
     for(int i=0; i < mesh_count; i++) {
         FbxMesh *mesh = pFbxScene->GetSrcObject<FbxMesh>(i);
         
-        KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "  Mesh %i of %i: %s", i+1, mesh_count, mesh->GetNode()->GetName());
+        KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "  Mesh %i of %i: %s", i+1, mesh_count, mesh->GetNode()->GetName().c_str());
         LoadMesh(context, pFbxScene, pGeometryConverter, mesh);
     }