diff --git a/src/gui/components/cc_item_progressbar.cpp b/src/gui/components/cc_item_progressbar.cpp
index c4126f6dc..1613f4eb4 100644
--- a/src/gui/components/cc_item_progressbar.cpp
+++ b/src/gui/components/cc_item_progressbar.cpp
@@ -145,7 +145,7 @@ class CProgressBarCache
 
 		static inline unsigned int make16color(__u32 rgb){return 0xFF000000 | rgb;};
 
-		void pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col);
+		void pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col) const;
 		void pbcApplyGradient(fb_pixel_t *pixbuf);
 		void pbcCreateBitmaps();
 
@@ -177,7 +177,7 @@ class CProgressBarCache
 		}
 		void pbcClear();
 	public:
-		void pbcPaint(int x, int y, int pbc_active_width, int pbc_passive_width);
+		void pbcPaint(int x, int y, int pbc_active_width, int pbc_passive_width) const;
 		static CProgressBarCache *pbcLookup(	int dy,
 							int dx,
 							int active_col,
@@ -222,7 +222,7 @@ CProgressBarCache *CProgressBarCache::pbcLookup(int dy, int dx, int active_col,
 	return pbc;
 }
 
-void CProgressBarCache::pbcPaint(int x, int y, int pbc_active_width, int pbc_passive_width)
+void CProgressBarCache::pbcPaint(int x, int y, int pbc_active_width, int pbc_passive_width) const
 {
 	y += yoff;
 	static CFrameBuffer *frameBuffer = CFrameBuffer::getInstance();
@@ -249,7 +249,7 @@ void CProgressBarCache::pbcPaint(int x, int y, int pbc_active_width, int pbc_pas
 	}
 }
 
-void CProgressBarCache::pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col)
+void CProgressBarCache::pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col) const
 {
 	if (x < 0) {
 		dx -= x;
diff --git a/src/gui/components/cc_timer.cpp b/src/gui/components/cc_timer.cpp
index d6659aa38..5f32adf2d 100644
--- a/src/gui/components/cc_timer.cpp
+++ b/src/gui/components/cc_timer.cpp
@@ -143,10 +143,12 @@ bool CComponentsTimer::startTimer()
 bool CComponentsTimer::stopTimer()
 {
 	tm_enable = false;
-	OnTimer.clear();
 	stopThread();
-	if(tm_thread == 0)
+	if(tm_thread == 0){
+		if (!OnTimer.empty())
+			OnTimer.clear();
 		return true;
+	}
 
 	return false;
 }