diff --git a/app/controllers/spree/admin/comments_controller.rb b/app/controllers/spree/admin/comments_controller.rb
index eab12ee..b37e66e 100644
--- a/app/controllers/spree/admin/comments_controller.rb
+++ b/app/controllers/spree/admin/comments_controller.rb
@@ -2,6 +2,6 @@ class Spree::Admin::CommentsController < Spree::Admin::ResourceController
   private
   
   def location_after_save
-    :back
+    request.referer
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20091021182639_create_comments.rb b/db/migrate/20091021182639_create_comments.rb
index f74aae9..7e1b694 100644
--- a/db/migrate/20091021182639_create_comments.rb
+++ b/db/migrate/20091021182639_create_comments.rb
@@ -1,4 +1,4 @@
-class CreateComments < ActiveRecord::Migration
+class CreateComments < ActiveRecord::Migration[4.2]
   def self.up
     create_table :comments do |t|
       t.string :title, :limit => 50
diff --git a/db/migrate/20100406085611_create_comment_types.rb b/db/migrate/20100406085611_create_comment_types.rb
index 1a6dd0e..9b1d3ce 100644
--- a/db/migrate/20100406085611_create_comment_types.rb
+++ b/db/migrate/20100406085611_create_comment_types.rb
@@ -1,4 +1,4 @@
-class CreateCommentTypes < ActiveRecord::Migration
+class CreateCommentTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :comment_types do |t|
       t.string :name
diff --git a/db/migrate/20100406100728_add_type_to_comments.rb b/db/migrate/20100406100728_add_type_to_comments.rb
index cef3e27..3c762ea 100644
--- a/db/migrate/20100406100728_add_type_to_comments.rb
+++ b/db/migrate/20100406100728_add_type_to_comments.rb
@@ -1,4 +1,4 @@
-class AddTypeToComments < ActiveRecord::Migration
+class AddTypeToComments < ActiveRecord::Migration[4.2]
   def self.up
     add_column :comments, :comment_type_id, :integer
   end
@@ -6,4 +6,4 @@ def self.up
   def self.down
     remove_column :comments, :comment_type_id
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20111123200847_prefix_tables_with_spree.rb b/db/migrate/20111123200847_prefix_tables_with_spree.rb
index c9bfa6e..d929b31 100644
--- a/db/migrate/20111123200847_prefix_tables_with_spree.rb
+++ b/db/migrate/20111123200847_prefix_tables_with_spree.rb
@@ -1,4 +1,4 @@
-class PrefixTablesWithSpree < ActiveRecord::Migration
+class PrefixTablesWithSpree < ActiveRecord::Migration[4.2]
   def change
     rename_table :comments, :spree_comments
     rename_table :comment_types, :spree_comment_types
diff --git a/spree_comments.gemspec b/spree_comments.gemspec
index b3ffab0..8762658 100644
--- a/spree_comments.gemspec
+++ b/spree_comments.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_path  = 'lib'
   s.requirements << 'none'
 
-  spree_version = '~> 3.1.0.beta'
+  spree_version = '~> 3.3.0'
   s.add_dependency 'spree_api', spree_version
   s.add_dependency 'spree_backend', spree_version
   s.add_dependency 'spree_core', spree_version