diff --git a/lib/redis/search/tasks.rb b/lib/redis/search/tasks.rb
index 85cc666..79c2843 100644
--- a/lib/redis/search/tasks.rb
+++ b/lib/redis/search/tasks.rb
@@ -11,12 +11,12 @@
     puts ""
     Redis::Search.indexed_models.each do |klass|
       print "[#{klass.to_s}]"
-      if klass.superclass.to_s == "ActiveRecord::Base"
+      if klass < ActiveRecord::Base
         klass.find_in_batches(:batch_size => 1000) do |items|
           items.each do |item|
             item.redis_search_index_create
-      			item = nil
-      			count += 1
+            item = nil
+            count += 1
             print "."
           end
         end
@@ -24,8 +24,8 @@
         klass.all.each_slice(1000) do |items|
           items.each do |item|
             item.redis_search_index_create
-      			item = nil
-      			count += 1
+            item = nil
+            count += 1
             print "."
           end
         end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f07f893..f293850 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,6 @@
 require 'rubygems'
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', File.dirname(__FILE__))
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))