diff --git a/common/drawframe.cpp b/common/drawframe.cpp
index d2eb982f47..92f7a495eb 100644
--- a/common/drawframe.cpp
+++ b/common/drawframe.cpp
@@ -945,6 +945,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
 
 void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
 {
+#ifdef KICAD_GAL
     if( aEnable && m_galCanvasActive )
     {
         // When we switch between GAL based canvases, all we need is a refresh
@@ -986,4 +987,5 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
     }
 
     m_galCanvasActive = aEnable;
+#endif /* KICAD_GAL */
 }
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index b28b743e5e..bfbfe9d2fe 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -417,7 +417,7 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( wxWindow* parent, const wxString& title,
                           wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );
 
     if( m_galCanvas )
-        m_auimgr.AddPane( m_galCanvas,
+        m_auimgr.AddPane( (wxWindow*) m_galCanvas,
                           wxAuiPaneInfo().Name( wxT( "DrawFrameGal" ) ).CentrePane().Hide() );
 
     if( m_messagePanel )