diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 0c365c1ec2..62679d5370 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -37,6 +37,8 @@ NGSPICE::NGSPICE()
 {
 #ifdef __WINDOWS__
     m_dll = new wxDynamicLibrary( "libngspice-0.dll" );
+#elif __APPLE__
+    m_dll = new wxDynamicLibrary( "libngspice.dylib" );
 #else
     m_dll = new wxDynamicLibrary( "libngspice.so" );
 #endif
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 7dda9938db..4b40753db0 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -332,8 +332,8 @@ bool CURSOR::Inside( wxPoint& aPoint )
     if( !m_window )
         return false;
 
-    return ( std::abs( aPoint.x - m_window->x2p( m_trace->x2s( m_coords.x ) ) ) <= DRAG_MARGIN )
-        || ( std::abs( aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN );
+    return ( std::abs( (double) aPoint.x - m_window->x2p( m_trace->x2s( m_coords.x ) ) ) <= DRAG_MARGIN )
+        || ( std::abs( (double) aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN );
 }
 
 
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index 32a16a391f..c704995fb0 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -93,7 +93,7 @@ static const unsigned char cursor_tune_mask[] = {
    0x3c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 };
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) or defined(__WXMAC__)
 struct SIM_CURSORS_INIT
 {
 public: