diff --git a/ChangeLog b/ChangeLog
index c1d00eda..166082e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-17  Markus Gans  <guru.mail@muenster.de>
+	* Improve FButton mouse click animation
+	* Minor data type corrections
+
 2018-12-15  Markus Gans  <guru.mail@muenster.de>
 	* Use of the C++11 auto specifier in the program code
 	* Code reduction by using of Range-based for loop
diff --git a/src/fbutton.cpp b/src/fbutton.cpp
index 37b8c0bb..65e87c35 100644
--- a/src/fbutton.cpp
+++ b/src/fbutton.cpp
@@ -345,10 +345,6 @@ void FButton::onMouseMove (FMouseEvent* ev)
 void FButton::onTimer (FTimerEvent* ev)
 {
   delTimer(ev->timerId());
-
-  if ( hasShadow() )
-    clearShadow();
-
   setUp();
 }
 
diff --git a/src/flistbox.cpp b/src/flistbox.cpp
index cd6f64e7..9016aab9 100644
--- a/src/flistbox.cpp
+++ b/src/flistbox.cpp
@@ -295,9 +295,9 @@ void FListBox::remove (std::size_t item)
   element_count = getCount();
   max_line_width = 0;
 
-  for (auto&& item : itemlist)
+  for (auto&& listbox_item : itemlist)
   {
-    std::size_t len = item.getText().getLength();
+    std::size_t len = listbox_item.getText().getLength();
 
     if ( len > max_line_width )
       max_line_width = len;
diff --git a/src/fprogressbar.cpp b/src/fprogressbar.cpp
index 63c002af..d60aa106 100644
--- a/src/fprogressbar.cpp
+++ b/src/fprogressbar.cpp
@@ -115,7 +115,7 @@ void FProgressbar::hide()
   }
 
   setColor (fg, bg);
-  auto s = hasShadow() ? 1 : 0;
+  std::size_t s = hasShadow() ? 1 : 0;
   auto size = getWidth() + s;
 
   if ( size == 0 )
diff --git a/src/ftextview.cpp b/src/ftextview.cpp
index 962c838d..a481ffdd 100644
--- a/src/ftextview.cpp
+++ b/src/ftextview.cpp
@@ -203,7 +203,7 @@ void FTextView::hide()
   }
 
   setColor (fg, bg);
-  auto n = isNewFont() ? 1 : 0;
+  std::size_t n = isNewFont() ? 1 : 0;
   auto size = getWidth() + n;
 
   if ( size == 0 )
diff --git a/src/fvterm.cpp b/src/fvterm.cpp
index a73be984..123aff64 100644
--- a/src/fvterm.cpp
+++ b/src/fvterm.cpp
@@ -1486,8 +1486,8 @@ void FVTerm::putArea (int ax, int ay, term_area* area)
     if ( area->changes[y].trans_count == 0 )
     {
       // Line has only covered characters
-      auto ac = &area->text[y * line_len + ol];
-      auto tc = &vterm->text[(ay + y) * vterm->width + ax];
+      ac = &area->text[y * line_len + ol];
+      tc = &vterm->text[(ay + y) * vterm->width + ax];
       putAreaLine (ac, tc, length);
     }
     else
diff --git a/src/fwidget.cpp b/src/fwidget.cpp
index fdc9c1b3..0afa6f9f 100644
--- a/src/fwidget.cpp
+++ b/src/fwidget.cpp
@@ -1317,7 +1317,7 @@ void FWidget::drawFlatBorder()
       // left line (on right side)
       print (fc::NF_border_line_left);
 
-    setPrintPos (x2, y1 + y + 2);
+    setPrintPos (x2, y1 + int(y) + 2);
   }
 
   setPrintPos (x1, y1);