Yet more fixes for latest Elixir version