diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59da1b7..e7962df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * [#122](https://github.com/codegram/hyperclient/pull/122): Improve error message when server returns invalid data - [@ivoanjo](https://github.com/ivoanjo).
 * [#125](https://github.com/codegram/hyperclient/pull/125): Add table of contents to readme and add note asking users to add their projects to the wiki - [@ivoanjo](https://github.com/ivoanjo).
+* [#127](https://github.com/codegram/hyperclient/pull/127): Minor fixes: Fix warnings, and pry-byebug to dev Gemfile and tweak rubocop execution - [@ivoanjo](https://github.com/ivoanjo).
 * Your contribution here.
 
 ### 0.8.5 (July 5, 2017)
diff --git a/Gemfile b/Gemfile
index 14d9cca..0f4ee97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ group :development do
   gem 'guard-minitest'
   gem 'guard-spinach'
   gem 'pry'
+  gem 'pry-byebug', platforms: :ruby
 end
 
 group :development, :test do
diff --git a/Rakefile b/Rakefile
index c74bdc2..240d9c4 100755
--- a/Rakefile
+++ b/Rakefile
@@ -38,4 +38,4 @@ end
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :test, :spinach]
+task default: [:test, :spinach, :rubocop]
diff --git a/lib/hyperclient/entry_point.rb b/lib/hyperclient/entry_point.rb
index 9e747da..c880ebb 100644
--- a/lib/hyperclient/entry_point.rb
+++ b/lib/hyperclient/entry_point.rb
@@ -41,6 +41,8 @@ def initialize(url, &_block)
       @options = { async: true }
       @connection = nil
       @resource = nil
+      @key = nil
+      @uri_variables = nil
       yield self if block_given?
     end