diff --git a/lib/geocoder/results/test.rb b/lib/geocoder/results/test.rb
index 17905f07cda7d503e5f71680f3e627d2e4888f30..61d422ce13ee08b2ed2b1ea92428a5229cd0d29c 100644
--- a/lib/geocoder/results/test.rb
+++ b/lib/geocoder/results/test.rb
@@ -22,7 +22,7 @@ module Geocoder
       end
 
       def initialize(data)
-        data.keys.each do |attr|
+        data.each_key do |attr|
           Test.add_result_attribute(attr)
         end
 
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index 91fabe05b126cfcb282a8e5f29140b543a38932a..fddcc85485adc9526e07e948a515081fe2dbf178 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -118,13 +118,13 @@ module Geocoder::Store
         latitude_attribute = options[:latitude] || geocoder_options[:latitude]
         longitude_attribute = options[:longitude] || geocoder_options[:longitude]
         options[:units] ||= (geocoder_options[:units] || Geocoder.config.units)
-        select_distance = options.fetch(:select_distance, true)
+        select_distance = options.fetch(:select_distance)  { true }
         options[:order] = "" if !select_distance && !options.include?(:order)
-        select_bearing = options.fetch(:select_bearing, true)
+        select_bearing = options.fetch(:select_bearing) { true }
         bearing = bearing_sql(latitude, longitude, options)
         distance = distance_sql(latitude, longitude, options)
-        distance_column = options.fetch(:distance_column, 'distance')
-        bearing_column = options.fetch(:bearing_column, 'bearing')
+        distance_column = options.fetch(:distance_column) { 'distance' }
+        bearing_column = options.fetch(:bearing_column)  { 'bearing' }
 
         b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
         args = b + [
diff --git a/test/unit/test_mode_test.rb b/test/unit/test_mode_test.rb
index 38b054c04bfe7a8eefc9f5a5e896f2eddf844acd..a27d304fe6b140707598f493a3ecf7de878bc883 100644
--- a/test/unit/test_mode_test.rb
+++ b/test/unit/test_mode_test.rb
@@ -21,7 +21,7 @@ class TestModeTest < GeocoderTestCase
     result = results.first
 
     assert_equal 1, results.size
-    mock_attributes.keys.each do |attr|
+    mock_attributes.each_key do |attr|
       assert_equal mock_attributes[attr], result.send(attr)
     end
   end