diff --git a/src/cloud/ec2/lib/views/describe_images.erb b/src/cloud/ec2/lib/views/describe_images.erb
index 05a84f57eb..d4a787e005 100644
--- a/src/cloud/ec2/lib/views/describe_images.erb
+++ b/src/cloud/ec2/lib/views/describe_images.erb
@@ -6,9 +6,9 @@
 	 	<item> 
 		   	<imageId>ami-<%= sprintf('%08i', im.id) %></imageId> 
 		   	<imageLocation><%= im['SOURCE'].split('/').last %></imageLocation> 
-			<% if im['STATE'] == '4' %>
+			<% if im['STATE'] == '3' %>
 			<imageState>deregistered</imageState> 
-			<% elsif im['STATE'] == '2' %>
+			<% elsif im['STATE'] == '1' || im['STATE'] == '2' %>
 			<imageState>available</imageState> 
 			<% end %>
 			<imageOwnerId><%= erb_user_name %></imageOwnerId> 
diff --git a/src/cloud/ec2/lib/views/run_instances.erb b/src/cloud/ec2/lib/views/run_instances.erb
index a33481372c..b20fb733e6 100644
--- a/src/cloud/ec2/lib/views/run_instances.erb
+++ b/src/cloud/ec2/lib/views/run_instances.erb
@@ -9,7 +9,7 @@
   <instancesSet> 
     <item> 
       <instanceId>i-<%= erb_vm_info[:vm_id] %></instanceId> 
-      <imageId><%= erb_vm_info[:img_id] %></imageId> 
+      <imageId><%= erb_vm_info[:ec2_img_id] %></imageId> 
       <instanceState> 
         <code>0</code> 
         <name>pending</name>