diff --git a/lib/fog/ibm/models/compute/server.rb b/lib/fog/ibm/models/compute/server.rb
index 2aec17e20..33bead205 100644
--- a/lib/fog/ibm/models/compute/server.rb
+++ b/lib/fog/ibm/models/compute/server.rb
@@ -78,18 +78,17 @@ module Fog
 
         def reboot
           requires :id
-          connection.modify_instance(id, 'state' => 'restart')
+          connection.modify_instance(id, 'state' => 'restart').body['success']
         end
 
         def destroy
           requires :id
-          data = connection.delete_instance(id)
-          data.body['success']
+          connection.delete_instance(id).body['success']
         end
 
         def rename(name)
           requires :id
-          if connection.modify_instance(id, {'name' => name}).body["success"]
+          if connection.modify_instance(id, 'name' => name).body["success"]
             attributes[:name] = name
           else
             return false
@@ -136,11 +135,13 @@ module Fog
         # Sets expiration time - Pass an instance of Time.
         def expire_at(time)
           expiry_time = (time.tv_sec * 1000).to_i
-          success = connection.set_instance_expiration(id, expiry_time).body["expirationTime"] == expiry_time
-          if success
+          data = connection.modify_instance(id, 'expirationTime' => expiry_time)
+          if data.body['expirationTime'] == expiry_time
             attributes[:expires_at] = expiry_time
+            true
+          else
+            false
           end
-          success
         end
 
         # Expires the instance immediately
diff --git a/lib/fog/ibm/requests/compute/modify_instance.rb b/lib/fog/ibm/requests/compute/modify_instance.rb
index 0b9ce7af9..1210999b8 100644
--- a/lib/fog/ibm/requests/compute/modify_instance.rb
+++ b/lib/fog/ibm/requests/compute/modify_instance.rb
@@ -57,7 +57,7 @@ module Fog
             elsif params['expirationTime']
               self.data[:instances][instance_id]["expirationTime"] = params['expirationTime']
               response.status = 200
-              response.body = { "success" => true }
+              response.body = { 'expirationTime' => params['expirationTime'] }
             end
           else
             response.status = 404