diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 92e69a854..22f78b14e 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -43,6 +43,11 @@ Camera::Camera(int camera_index, const Kart* kart)
     m_mode     = CM_NORMAL;
     m_index    = camera_index;
     m_camera   = irr_driver->addCameraSceneNode();
+    
+#ifdef DEBUG
+    m_camera->setName(core::stringc("Camera for ") + kart->getKartProperties()->getName());
+#endif
+    
     setupCamera();
     m_distance = kart->getKartProperties()->getCameraDistance();
     m_kart     = kart;
@@ -166,7 +171,6 @@ void Camera::setupCamera()
     m_camera->setFOV(m_fov);
     m_camera->setAspectRatio(m_aspect);
     m_camera->setFarValue(World::getWorld()->getTrack()->getCameraFar());
-    
     }   // setupCamera
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp
index ac4f20071..635b554fd 100644
--- a/src/graphics/particle_emitter.cpp
+++ b/src/graphics/particle_emitter.cpp
@@ -47,6 +47,8 @@ public:
         scene::ICameraSceneNode* curr_cam = irr_driver->getSceneManager()->getActiveCamera();
         const core::vector3df& cam_pos = curr_cam->getPosition();
         
+        // printf("Affect called with now=%u, camera=%s\n", now, curr_cam->getName());
+        
         for (unsigned int n=0; n<count; n++)
         {
             scene::SParticle& curr = particlearray[n];