diff --git a/library/Core.cpp b/library/Core.cpp
index 165f5e5e8..620fc81d2 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1220,9 +1220,8 @@ bool Core::ncurses_wgetch(int in, int & out)
     return true;
 }
 
-int UnicodeAwareSym(const SDL::Event& event)
+int UnicodeAwareSym(const SDL::KeyboardEvent& ke)
 {
-    auto ke = (const SDL::KeyboardEvent &) event;
     // Assume keyboard layouts don't change the order of numbers:
     if( '0' <= ke.ksym.sym && ke.ksym.sym <= '9') return ke.ksym.sym;
     if(SDL::K_F1 <= ke.ksym.sym && ke.ksym.sym <= SDL::K_F12) return ke.ksym.sym;
diff --git a/library/Hooks-linux.cpp b/library/Hooks-linux.cpp
index 3628aab63..ef1a765cb 100644
--- a/library/Hooks-linux.cpp
+++ b/library/Hooks-linux.cpp
@@ -79,7 +79,7 @@ DFhackCExport int SDL_PollEvent(SDL::Event* event)
     {
         DFHack::Core & c = DFHack::Core::getInstance();
         // if we consume the event, ask SDL for more.
-        if(!c.SDL_Event(event))
+        if(!c.DFH_SDL_Event(event))
             goto pollevent_again;
     }
     return orig_return;
diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp
index 5d2ed5b2c..dbf546070 100644
--- a/plugins/workflow.cpp
+++ b/plugins/workflow.cpp
@@ -971,9 +971,6 @@ static void compute_job_outputs(color_ostream &out, ProtectedJob *pj)
     case MillPlants:
         PLANT_PROCESS_MAT(MILL, mill);
         break;
-    case BrewDrink:
-        PLANT_PROCESS_MAT(DRINK, drink);
-        break;
     case ProcessPlants:
         PLANT_PROCESS_MAT(THREAD, thread);
         break;