More elixir 0.14 compatability work