diff --git a/src/preferences/cpufrequency/PreferencesWindow.h b/src/preferences/cpufrequency/PreferencesWindow.h
index 90ee52872b..d689ad53da 100644
--- a/src/preferences/cpufrequency/PreferencesWindow.h
+++ b/src/preferences/cpufrequency/PreferencesWindow.h
@@ -33,6 +33,7 @@
 #include <MessageFilter.h>
 
 // headers PreferencesWindow
+#include <Application.h>
 #include <GroupView.h>
 #include <Screen.h>
 #include <SpaceLayoutItem.h>
@@ -375,14 +376,14 @@ PreferencesWindow<Preferences>::MessageReceived(BMessage *msg)
 			break;
 			
 		case kDefaultMsg:
-			Defaults();
+			PreferencesStorage<Preferences>::Defaults();
 			fRevertButton->SetEnabled(true);
 			if (fPreferencesView)
 				PostMessage(kDefaultMsg, fPreferencesView);
 			break;
 			
 		case kRevertMsg:
-			Revert();
+			PreferencesStorage<Preferences>::Revert();
 			fRevertButton->SetEnabled(false);
 			if (fPreferencesView)
 				PostMessage(kRevertMsg, fPreferencesView);
@@ -425,7 +426,7 @@ template<typename Preferences>
 void
 PreferencesWindow<Preferences>::_MoveToPosition()
 {
-	BPoint position = WindowPosition();
+	BPoint position = PreferencesStorage<Preferences>::WindowPosition();
 	// center window on screen if it had a bad position
 	if(position.x < 0 && position.y < 0){
 		BRect rect = BScreen().Frame();
diff --git a/src/preferences/cpufrequency/StatusView.cpp b/src/preferences/cpufrequency/StatusView.cpp
index 36f3f93012..f64a3b7247 100644
--- a/src/preferences/cpufrequency/StatusView.cpp
+++ b/src/preferences/cpufrequency/StatusView.cpp
@@ -339,7 +339,7 @@ FrequencyMenu::UpdateMenu()
 
 
 StatusView::StatusView(BRect frame,	bool inDeskbar,
-						PreferencesStorage<freq_preferences>* storage = NULL)
+						PreferencesStorage<freq_preferences>* storage)
 	: BView(frame, kDeskbarItemName, B_FOLLOW_LEFT | B_FOLLOW_TOP,
 		B_WILL_DRAW | B_FRAME_EVENTS),
 	fInDeskbar(inDeskbar),
@@ -600,7 +600,7 @@ StatusView::ResizeToPreferred(void)
 
 
 void
-StatusView::ShowPopUpMenu(bool show = true)
+StatusView::ShowPopUpMenu(bool show)
 {
 	fShowPopUpMenu = show;
 }