diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp
index 7d60f0997..544c5761d 100644
--- a/src/driver/screenshot.cpp
+++ b/src/driver/screenshot.cpp
@@ -56,7 +56,7 @@ extern "C" {
 extern cVideo *videoDecoder;
 
 /* constructor, defaults is empty fname and CScreenShot::FORMAT_JPG format */
-CScreenShot::CScreenShot(const std::string fname, screenshot_format_t fmt)
+CScreenShot::CScreenShot(const std::string &fname, screenshot_format_t fmt)
 {
 	format = fmt;
 	filename = fname;
diff --git a/src/driver/screenshot.h b/src/driver/screenshot.h
index 90f8309f2..f5f0c7332 100644
--- a/src/driver/screenshot.h
+++ b/src/driver/screenshot.h
@@ -78,7 +78,7 @@ class CScreenShot
 #endif // SCREENSHOT_INTERNAL
 
 	public:
-		CScreenShot(const std::string fname = "", screenshot_format_t fmt = CScreenShot::FORMAT_JPG);
+		CScreenShot(const std::string &fname = "", screenshot_format_t fmt = CScreenShot::FORMAT_JPG);
 		~CScreenShot();
 
 		void MakeFileName(const t_channel_id channel_id);
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 57479285b..3b71b2c01 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -378,7 +378,7 @@ private:
 	int exec(CMenuTarget* parent);
 	int isMenueOptionChooser(void) const{return 1;}
 	int getWidth(void);
-	void setNumberFormat(std::string format) { numberFormat = format; }
+	void setNumberFormat(const std::string &format) { numberFormat = format; }
 	void setNumberFormat(std::string (*fun)(int)) { numberFormatFunction = fun; }
 	void setNumericInput(bool _numeric_input) { numeric_input = _numeric_input; }
 	void setLocalizedValue(int special_value, neutrino_locale_t special_value_name)
@@ -688,11 +688,9 @@ class CPINProtection
 		virtual CMenuTarget* getParent() = 0;
 		neutrino_locale_t title, hint;
 	public:
-		CPINProtection(std::string &validpin)
+		CPINProtection(std::string &validpin): title( LOCALE_PINPROTECTION_HEAD),hint(NONEXISTANT_LOCALE)
 		{ 
 			validPIN = &validpin;
-			hint = NONEXISTANT_LOCALE;
-			title = LOCALE_PINPROTECTION_HEAD;
 		};
 		virtual ~CPINProtection(){}
 		virtual void setTitle(neutrino_locale_t Title){title = Title;};