diff --git a/atom/browser/api/atom_api_menu_gtk.cc b/atom/browser/api/atom_api_menu_gtk.cc
index dff0b0326bc..28f36ac3e1f 100644
--- a/atom/browser/api/atom_api_menu_gtk.cc
+++ b/atom/browser/api/atom_api_menu_gtk.cc
@@ -22,7 +22,7 @@ void MenuGtk::Popup(Window* window) {
   uint32_t triggering_event_time;
   gfx::Point point;
 
-  BrowserWindow* native_window = window->window();
+  NativeWindow* native_window = window->window();
   GdkEventButton* event = native_window->GetWebContents()->
       GetRenderWidgetHostView()->GetLastMouseDown();
   if (event) {
diff --git a/atom/browser/api/atom_api_menu_gtk.h b/atom/browser/api/atom_api_menu_gtk.h
index 1a2bbdd9ba6..65aab47923d 100644
--- a/atom/browser/api/atom_api_menu_gtk.h
+++ b/atom/browser/api/atom_api_menu_gtk.h
@@ -14,12 +14,13 @@ namespace api {
 
 class MenuGtk : public Menu,
                 public ::MenuGtk::Delegate {
+ public:
+  MenuGtk();
+
  protected:
   virtual void Popup(Window* window) OVERRIDE;
 
  private:
-  MenuGtk();
-
   scoped_ptr<::MenuGtk> menu_gtk_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuGtk);
diff --git a/atom/browser/api/atom_api_menu_win.h b/atom/browser/api/atom_api_menu_win.h
index eed70035910..2d4344fd993 100644
--- a/atom/browser/api/atom_api_menu_win.h
+++ b/atom/browser/api/atom_api_menu_win.h
@@ -14,12 +14,13 @@ class Menu2;
 namespace api {
 
 class MenuWin : public Menu {
+ public:
+  MenuWin();
+
  protected:
   virtual void Popup(Window* window) OVERRIDE;
 
  private:
-  MenuWin();
-
   scoped_ptr<atom::Menu2> menu_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuWin);
diff --git a/atom/common/native_mate_converters/string16_converter.h b/atom/common/native_mate_converters/string16_converter.h
index a3b360fd674..7c304931866 100644
--- a/atom/common/native_mate_converters/string16_converter.h
+++ b/atom/common/native_mate_converters/string16_converter.h
@@ -21,7 +21,7 @@ struct Converter<string16> {
                      v8::Handle<v8::Value> val,
                      string16* out) {
     v8::String::Value s(val);
-    *out = string16(reinterpret_cast<const char16*>(*s), s.length());
+    out->assign(reinterpret_cast<const char16*>(*s), s.length());
     return true;
   }
 };