Update to work on latest and greatest elixir