Cleaned up deprecations

Just cleaning up some small deprecations with Elixir 0.12.2