diff --git a/lib/elb/elb_interface.rb b/lib/elb/elb_interface.rb
index d11c97f..00078dd 100644
--- a/lib/elb/elb_interface.rb
+++ b/lib/elb/elb_interface.rb
@@ -95,6 +95,7 @@ def create_load_balancer(name, availability_zones, listeners)
         params["Listeners.member.#{i}.Protocol"]         = "#{l[:protocol]}"
         params["Listeners.member.#{i}.LoadBalancerPort"] = "#{l[:load_balancer_port]}"
         params["Listeners.member.#{i}.InstancePort"]     = "#{l[:instance_port]}"
+        params["Listeners.member.#{i}.SSLCertificateId"] = "#{l[:ssl_certificate_id]}"
         i                                                += 1
       end
       params['LoadBalancerName'] = name
@@ -363,4 +364,4 @@ def reset
   end
 
 
-end
\ No newline at end of file
+end
diff --git a/lib/iam/iam.rb b/lib/iam/iam.rb
index 3d69b47..3e52c7f 100644
--- a/lib/iam/iam.rb
+++ b/lib/iam/iam.rb
@@ -106,7 +106,7 @@ def upload_server_certificate(name, public_key, private_key, options={})
 
       p params
 
-      resp = do_request("UploadServerCertificate", params, :pull_out_array=>[:list_server_certificates_result, :server_certificate_metadata_list])
+      resp = do_request("UploadServerCertificate", params, :pull_out_array=>[:upload_server_certificate_result, :server_certificate_metadata])
 
 
     rescue Exception
@@ -117,4 +117,4 @@ def upload_server_certificate(name, public_key, private_key, options={})
   end
 
 
-end
\ No newline at end of file
+end