diff --git a/apps/cf/lib/errors/errors.ex b/apps/cf/lib/errors/errors.ex
index b693fc34..b9ece8ad 100644
--- a/apps/cf/lib/errors/errors.ex
+++ b/apps/cf/lib/errors/errors.ex
@@ -42,18 +42,6 @@ defmodule CF.Errors do
     :ok
   end
 
-  defp build_occurence_data(params) do
-    default_occurrence_data()
-    |> add_user(params[:user])
-    |> Map.merge(params[:data] || %{})
-  end
-
-  defp default_occurrence_data() do
-    %{
-      "code_version" => CF.Application.version()
-    }
-  end
-
   defp add_user(base, nil),
     do: base
 
diff --git a/apps/db/lib/db_schema/video.ex b/apps/db/lib/db_schema/video.ex
index 68964fe1..b39b6e33 100644
--- a/apps/db/lib/db_schema/video.ex
+++ b/apps/db/lib/db_schema/video.ex
@@ -297,13 +297,4 @@ defmodule DB.Schema.Video do
         )
     end)
   end
-
-  # Return IDs of videos with at least 3 statements
-  defp popular_videos_subquery do
-    Video
-    |> join(:inner, [v], s in assoc(v, :statements))
-    |> select([:id])
-    |> group_by([v], v.id)
-    |> having([v, s], count(s.id) >= 3)
-  end
 end
diff --git a/apps/db/lib/db_type/flag_reason.ex b/apps/db/lib/db_type/flag_reason.ex
index 5a45bac6..c34da214 100644
--- a/apps/db/lib/db_type/flag_reason.ex
+++ b/apps/db/lib/db_type/flag_reason.ex
@@ -66,4 +66,7 @@ defmodule DB.Type.FlagReason do
     |> Enum.find(fn {_, id} -> id == reason_id end)
     |> elem(0)
   end
+
+  # Implement the embed_as/1 function required by the Ecto.Type behaviour
+  def embed_as(_), do: :dump
 end
diff --git a/apps/db/mix.exs b/apps/db/mix.exs
index 314ec309..aecef55d 100644
--- a/apps/db/mix.exs
+++ b/apps/db/mix.exs
@@ -55,6 +55,7 @@ defmodule DB.Mixfile do
       {:mime, "~> 1.2"},
       {:scrivener_ecto, "~> 2.0"},
       {:algoliax, "~> 0.7.1"},
+      {:httpoison, "~> 2.2"},
 
       # Dev only
       {:exsync, "~> 0.2", only: :dev},
diff --git a/apps/db/test/db_schema/speaker_test.exs b/apps/db/test/db_schema/speaker_test.exs
index 13be6ec3..5d7aac01 100644
--- a/apps/db/test/db_schema/speaker_test.exs
+++ b/apps/db/test/db_schema/speaker_test.exs
@@ -4,7 +4,7 @@ defmodule DB.Schema.SpeakerTest do
   alias DB.Schema.Speaker
 
   @valid_attrs %{
-    full_name: "#{Faker.Name.first_name()} #{Faker.Name.last_name()}",
+    full_name: "#{Faker.Person.first_name()} #{Faker.Person.last_name()}",
     wikidata_item_id: nil
   }
   @invalid_attrs %{}
diff --git a/apps/db/test/support/factory.ex b/apps/db/test/support/factory.ex
index 050d1c81..25019ffd 100644
--- a/apps/db/test/support/factory.ex
+++ b/apps/db/test/support/factory.ex
@@ -25,7 +25,7 @@ defmodule DB.Factory do
 
   def user_factory do
     %User{
-      name: Faker.Name.first_name(),
+      name: Faker.Person.first_name(),
       username: "User-#{random_string(10)}",
       email: Faker.Internet.email(),
       encrypted_password: "$2b$12$fe55IfCdqNzKp1wMIJDwVeG3f7guOduEE5HS2C9IJyfkuk3avbjQG",
@@ -65,8 +65,8 @@ defmodule DB.Factory do
 
   def speaker_factory do
     %Speaker{
-      full_name: Faker.Name.name(),
-      title: Faker.Name.title(),
+      full_name: Faker.Person.name(),
+      title: Faker.Person.title(),
       country: Faker.Address.country_code()
     }
   end