Updates scopes to remove Rails 4 deprecation warnings