fixes to run with latest Elixir