diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt
index bb7427f26..0ebc8a0b1 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/CMakeLists.txt
@@ -10,8 +10,8 @@ INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 
 FILE(GLOB SRC *.cpp *.h)
 
-FILE(GLOB OVQT_SCENE_SRC      scene/*.cpp scene/*.h)
-FILE(GLOB OVQT_PS_SRC         particle_system/*.h particle_system/*.cpp)
+FILE(GLOB OVQT_SCENE_SRC      scene/*.cpp scene/*.h)
+FILE(GLOB OVQT_PS_SRC         particle_system/*.h particle_system/*.cpp)
 FILE(GLOB OVQT_VEGETABLE_SRC  vegetable/*.h vegetable/*.cpp)
 FILE(GLOB OVQT_WIDGETS_SRC    widgets/*.h widgets/*.cpp)
 
@@ -22,22 +22,22 @@ SET(OVQT_EXT_SYS_SRC	${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.
 SET(OBJECT_VIEWER_PLUGIN_QT_HDR object_viewer_plugin.h
 				main_window.h
 				graphics_viewport.h
-				graphics_settings_page.h
-				sound_settings_page.h
+				graphics_settings_page.h
+				sound_settings_page.h
 				vegetable_settings_page.h
 
 				scene/animation_dialog.h
 				scene/animation_set_dialog.h
 				scene/setup_fog_dialog.h
 				scene/slot_manager_dialog.h
-				scene/water_pool_dialog.h
-				scene/skeleton_scale_dialog.h 
-				scene/skeleton_tree_model.h 
-				scene/global_wind_dialog.h
-				scene/day_night_dialog.h
+				scene/water_pool_dialog.h
+				scene/skeleton_scale_dialog.h 
+				scene/skeleton_tree_model.h 
+				scene/global_wind_dialog.h
+				scene/day_night_dialog.h
 				scene/sun_color_dialog.h
-				scene/tune_mrm_dialog.h
-				scene/tune_timer_dialog.h
+				scene/tune_mrm_dialog.h
+				scene/tune_timer_dialog.h
 				scene/camera_control.h
 
 				particle_system/particle_control_dialog.h
@@ -82,23 +82,23 @@ SET(OBJECT_VIEWER_PLUGIN_QT_HDR object_viewer_plugin.h
 				vegetable/vegetable_scale_page.h
 				vegetable/vegetable_appearance_page.h
 				vegetable/vegetable_rotate_page.h
-
-				widgets/edit_range_widget.h
-				widgets/color_edit_widget.h
-				widgets/hoverpoints.h
+
+				widgets/edit_range_widget.h
+				widgets/color_edit_widget.h
+				widgets/hoverpoints.h
 )
 
 SET(OBJECT_VIEWER_PLUGIN_UIS    scene/animation_form.ui
 				scene/animation_set_form.ui
 				scene/setup_fog_form.ui
 				scene/slot_form.ui
-				scene/skeleton_scale_form.ui
-				scene/water_pool_form.ui
-				scene/global_wind_form.ui
-				scene/sun_color_form.ui
-				scene/day_night_form.ui
-				scene/tune_mrm_form.ui
-				scene/tune_timer_form.ui
+				scene/skeleton_scale_form.ui
+				scene/water_pool_form.ui
+				scene/global_wind_form.ui
+				scene/sun_color_form.ui
+				scene/day_night_form.ui
+				scene/tune_mrm_form.ui
+				scene/tune_timer_form.ui
 				
 				particle_system/particle_control_form.ui
 				particle_system/particle_workspace_form.ui
@@ -125,8 +125,8 @@ SET(OBJECT_VIEWER_PLUGIN_UIS    scene/animation_form.ui
 				particle_system/particle_texture_anim_form.ui
 				particle_system/multi_tex_form.ui				
 				particle_system/particle_link_skeleton_form.ui
-				particle_system/scheme_bank_form.ui
-				particle_system/value_gradient_form.ui
+				particle_system/scheme_bank_form.ui
+				particle_system/value_gradient_form.ui
 
 				vegetable/vegetable_dialog_form.ui
 				vegetable/vegetable_noise_value_form.ui
@@ -137,7 +137,7 @@ SET(OBJECT_VIEWER_PLUGIN_UIS    scene/animation_form.ui
 				vegetable/vegetable_scale_form.ui
 
 				widgets/color_edit_form.ui
-				widgets/edit_range_float_form.ui
+				widgets/edit_range_float_form.ui
 				widgets/edit_range_uint_form.ui
 
 				graphics_settings_page.ui
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
index b3816a034..771568550 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/basic_edit_widget.cpp
@@ -202,15 +202,15 @@ void CBasicEditWidget::updateGraphics()
 }
 
 bool CBasicEditWidget::eventFilter(QObject *object, QEvent *event)
-{
-	if( event->type() == QEvent::Paint )
-	{
+{
+	if( event->type() == QEvent::Paint )
+	{
 		QPainter painter(_ui.graphicsWidget);
 		painter.setRenderHint(QPainter::Antialiasing, true);
 		painter.setBrush(QBrush(Qt::white));
 		painter.setPen(QPen(Qt::black, 2, Qt::SolidLine));
-		painter.drawRoundedRect(QRect(3, 3, _ui.graphicsWidget->width() - 6, _ui.graphicsWidget->height() - 6), 3.0, 3.0);
-	}
+		painter.drawRoundedRect(QRect(3, 3, _ui.graphicsWidget->width() - 6, _ui.graphicsWidget->height() - 6), 3.0, 3.0);
+	}
 	return QWidget::eventFilter(object, event);
 }
-} /* namespace NLQT */
\ No newline at end of file
+} /* namespace NLQT */
diff --git a/code/ryzom/client/src/attached_fx.cpp b/code/ryzom/client/src/attached_fx.cpp
index 0934d9a15..0f520f689 100644
--- a/code/ryzom/client/src/attached_fx.cpp
+++ b/code/ryzom/client/src/attached_fx.cpp
@@ -197,7 +197,7 @@ void CAttachedFX::create(CCharacterCL					 &parent,
 			if (targeterInfo.StickMode.UserBoneName != 0)
 			{
 				CEntityCL *targeter =  EntitiesMngr.entity(TargeterInfo.Slot);
-				if (targeter && targeter->skeleton())
+				if (parent.skeleton() && targeter && targeter->skeleton())
 				{
 					TargeterUserBoneID = parent.skeleton()->getBoneIdByName(NLMISC::CStringMapper::unmap(TargeterInfo.StickMode.UserBoneName));
 				}