Fix compile error on elixir master
Fix more compile errors