diff --git a/lib/event_store/advisory_locks.ex b/lib/event_store/advisory_locks.ex
index d8033b08..8fe9481f 100644
--- a/lib/event_store/advisory_locks.ex
+++ b/lib/event_store/advisory_locks.ex
@@ -52,6 +52,8 @@ defmodule EventStore.AdvisoryLocks do
   end
 
   def init(%State{} = state) do
+    Process.flag(:trap_exit, true)
+
     %State{conn: conn} = state
 
     {:ok, ref} = MonitoredServer.monitor(conn)
@@ -140,6 +142,14 @@ defmodule EventStore.AdvisoryLocks do
     {:noreply, state}
   end
 
+  def handle_info({:EXIT, _, :normal}, state) do
+    {:noreply, state}
+  end
+
+  def handle_info({:EXIT, _from, reason}, state) do
+    {:stop, reason, state}
+  end
+
   defp notify_lost_locks(locks, reason) do
     for {_ref, %Lock{} = lock} <- locks do
       %Lock{owner: owner, ref: ref} = lock
diff --git a/lib/event_store/storage/database.ex b/lib/event_store/storage/database.ex
index a7eabc0e..2cb15fd8 100644
--- a/lib/event_store/storage/database.ex
+++ b/lib/event_store/storage/database.ex
@@ -1,8 +1,6 @@
 defmodule EventStore.Storage.Database do
   @moduledoc false
 
-  require Logger
-
   def create(config), do: storage_up(config)
 
   def drop(config), do: storage_down(config)
diff --git a/lib/event_store/storage/lock.ex b/lib/event_store/storage/lock.ex
index 0e73b33a..06e19d09 100644
--- a/lib/event_store/storage/lock.ex
+++ b/lib/event_store/storage/lock.ex
@@ -1,8 +1,6 @@
 defmodule EventStore.Storage.Lock do
   @moduledoc false
 
-  require Logger
-
   alias EventStore.Sql.Statements
 
   @doc """
diff --git a/lib/event_store/streams/stream.ex b/lib/event_store/streams/stream.ex
index 3a161003..22f803cc 100644
--- a/lib/event_store/streams/stream.ex
+++ b/lib/event_store/streams/stream.ex
@@ -156,7 +156,7 @@ defmodule EventStore.Streams.Stream do
     events
     |> Enum.map(&map_to_recorded_event(&1, opts[:created_at_override] || utc_now(), serializer))
     |> Enum.with_index(1)
-    |> Enum.map(fn {recorded_event, index} ->
+    |> Enum.map(fn {%RecordedEvent{} = recorded_event, index} ->
       %RecordedEvent{
         recorded_event
         | stream_uuid: stream_uuid,