More fixes for latest Elixir version