diff --git a/include/nana/gui/place.hpp b/include/nana/gui/place.hpp
index 1459ba56..a7e7e0ea 100644
--- a/include/nana/gui/place.hpp
+++ b/include/nana/gui/place.hpp
@@ -10,7 +10,7 @@
  *	@file: nana/gui/place.cpp
  *
  *	@contributions:
- *	min/max and splitter bar initial weight by qPCR4vir.
+ *	min/max and splitter bar initial weight by Ariel Vina-Rodriguez.
  */
 
 #ifndef NANA_GUI_PLACE_HPP
diff --git a/include/nana/gui/widgets/panel.hpp b/include/nana/gui/widgets/panel.hpp
index cf732a7d..648880ec 100644
--- a/include/nana/gui/widgets/panel.hpp
+++ b/include/nana/gui/widgets/panel.hpp
@@ -9,7 +9,7 @@
  *
  *	@file: nana/gui/widgets/panel.hpp
  *	@author: Jinhao
- *	@contributors: qPCR4vir
+ *	@contributors: Ariel Vina-Rodriguez
  *
  *	@brief panel is a widget used for placing some widgets.
  */
diff --git a/source/gui/detail/win32/bedrock.cpp b/source/gui/detail/win32/bedrock.cpp
index ec692d36..9313a588 100644
--- a/source/gui/detail/win32/bedrock.cpp
+++ b/source/gui/detail/win32/bedrock.cpp
@@ -8,6 +8,7 @@
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
  *	@file: nana/gui/detail/win32/bedrock.cpp
+ *	@contributors: Ariel Vina-Rodriguez
  */
 
 #include <nana/config.hpp>
@@ -1101,7 +1102,7 @@ namespace detail
 			case WM_MOUSEHWHEEL:
 				{
 					//The focus window receives the message in Windows system, it should be redirected to the hovered window
-                    ::POINT scr_pos{ pmdec.mouse.x, pmdec.mouse.y}; 	//Screen position
+					::POINT scr_pos{ int(LOWORD(lParam)), int(HIWORD(lParam)) };	//Screen position
 					auto pointer_wd = ::WindowFromPoint(scr_pos);
 					if (pointer_wd == root_window)
 					{
diff --git a/source/gui/widgets/label.cpp b/source/gui/widgets/label.cpp
index c0cf78c8..ab40bda8 100644
--- a/source/gui/widgets/label.cpp
+++ b/source/gui/widgets/label.cpp
@@ -9,7 +9,7 @@
  *
  *	@file: source/gui/widgets/label.cpp
  *	@author: Jinhao
- *	@contributors: qPCR4vir
+ *	@contributors: Ariel Vina-Rodriguez
  */
 
 #include <nana/gui/widgets/label.hpp>
@@ -588,7 +588,7 @@ namespace nana
 
 				std::pair<std::size_t, std::size_t> _m_locate(dstream::linecontainer::iterator& i, std::size_t pos)
 				{
-					std::pair<std::size_t, std::size_t> r;
+					//std::pair<std::size_t, std::size_t> r;	//deprecated
 
 					std::size_t n = i->data_ptr->text().length();
 					while(pos >= n)
@@ -853,24 +853,16 @@ namespace nana
 
 		label& label::text_align(align th, align_v tv)
 		{
-			internal_scope_guard isg;
+			internal_scope_guard lock;
 			auto impl = get_drawer_trigger().impl();
 
-			bool to_update = false;
-			if(impl->text_align != th)
+			if (th != impl->text_align || tv != impl->text_align_v)
 			{
 				impl->text_align = th;
-				to_update = true;
-			}
-
-			if(impl->text_align_v != tv)
-			{
 				impl->text_align_v = tv;
-				to_update = true;
+				API::refresh_window(*this);
 			}
 
-			if(to_update)
-				API::refresh_window(*this);
 			return *this;
 		}
 
diff --git a/source/gui/widgets/listbox.cpp b/source/gui/widgets/listbox.cpp
index 5ae31f61..e81a4859 100644
--- a/source/gui/widgets/listbox.cpp
+++ b/source/gui/widgets/listbox.cpp
@@ -8,7 +8,7 @@
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
  *	@file: nana/gui/widgets/listbox.cpp
- *	@contributors:	Hiroshi Seki, qPCR4vir
+ *	@contributors:	Hiroshi Seki, Ariel Vina-Rodriguez
  */
 
 #include <nana/gui/widgets/listbox.hpp>
diff --git a/source/gui/widgets/skeletons/text_editor.cpp b/source/gui/widgets/skeletons/text_editor.cpp
index 913d858d..bde7e746 100644
--- a/source/gui/widgets/skeletons/text_editor.cpp
+++ b/source/gui/widgets/skeletons/text_editor.cpp
@@ -8,7 +8,7 @@
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
  *	@file: nana/gui/widgets/skeletons/text_editor.cpp
- *	@contributors: qPCR4vir
+ *	@contributors: Ariel Vina-Rodriguez
  */
 #include <nana/gui/widgets/skeletons/text_editor.hpp>
 #include <nana/gui/widgets/skeletons/textbase_export_interface.hpp>