diff --git a/lib/fog/aws/models/compute/address.rb b/lib/fog/aws/models/compute/address.rb
index e0372e0d9..b978d1ba1 100644
--- a/lib/fog/aws/models/compute/address.rb
+++ b/lib/fog/aws/models/compute/address.rb
@@ -50,7 +50,7 @@ module Fog
           else
             @server = nil
             self.server_id = new_server.id
-            connection.associate_address(@server_id, @public_ip)
+            connection.associate_address(server_id, public_ip)
           end
         end
 
@@ -58,7 +58,7 @@ module Fog
           @server = nil
           self.server_id = nil
           unless new_record?
-            connection.disassociate_address(@public_ip)
+            connection.disassociate_address(public_ip)
           end
         end
 
diff --git a/lib/fog/aws/models/compute/security_groups.rb b/lib/fog/aws/models/compute/security_groups.rb
index 400a7193b..176a7c5e4 100644
--- a/lib/fog/aws/models/compute/security_groups.rb
+++ b/lib/fog/aws/models/compute/security_groups.rb
@@ -61,7 +61,7 @@ module Fog
             filters = {'group-name' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_security_groups(@filters).body
+          data = connection.describe_security_groups(filters).body
           load(data['securityGroupInfo'])
         end
 
diff --git a/spec/aws/models/compute/volumes_spec.rb b/spec/aws/models/compute/volumes_spec.rb
index 6bfced378..f3a78a032 100644
--- a/spec/aws/models/compute/volumes_spec.rb
+++ b/spec/aws/models/compute/volumes_spec.rb
@@ -39,7 +39,7 @@ describe 'Fog::AWS::Compute::Volumes' do
   describe "#get" do
 
     it "should return a Fog::AWS::Compute::Volume if a matching volume exists" do
-      volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
       volume.wait_for { ready? }
       get = AWS[:compute].volumes.get(volume.id)
       volume.attributes.should == get.attributes
diff --git a/tests/aws/requests/storage/bucket_tests.rb b/tests/aws/requests/storage/bucket_tests.rb
index a4ff8013e..c86a97eab 100644
--- a/tests/aws/requests/storage/bucket_tests.rb
+++ b/tests/aws/requests/storage/bucket_tests.rb
@@ -3,11 +3,12 @@ Shindo.tests('AWS::Storage | bucket requests', ['aws']) do
   tests('success') do
 
     @bucket_format = {
-      'IsTruncated' => Fog::Boolean,
-      'Marker'      => NilClass,
-      'MaxKeys'     => Integer,
-      'Name'        => String,
-      'Prefix'      => NilClass,
+      'CommonPrefixes'  => [],
+      'IsTruncated'     => Fog::Boolean,
+      'Marker'          => NilClass,
+      'MaxKeys'         => Integer,
+      'Name'            => String,
+      'Prefix'          => NilClass,
       'Contents'    => [{
         'ETag'          => String,
         'Key'           => String,