[Ethan] Fix rails4 deprecations