Updates for rails4 deprecations