diff --git a/api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java b/api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
index 8d9804ca20d..1719e5b2e4f 100644
--- a/api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
+++ b/api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
@@ -29,8 +29,6 @@ import com.cloud.api.Parameter;
 import com.cloud.api.PlugService;
 import com.cloud.api.ServerApiException;
 import com.cloud.api.response.VirtualRouterProviderResponse;
-import com.cloud.network.VirtualRouterProvider;
-import com.cloud.network.element.VirtualRouterElementService;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.network.VirtualRouterProvider;
diff --git a/build/developer.xml b/build/developer.xml
index c5c6b3e26ef..9049c77c8e0 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -374,14 +374,17 @@
   <target name="build-apidocs" description="Generate api documentation" depends="build-all-with-simulator">
       <property name="commands.file" location="${dist.dir}/client/conf/commands.properties" /> 
       <property name="commands.ext.file" location="${dist.dir}/client/conf/commands-ext.properties" />
-      <property name="commands.simulator.file" location="${dist.dir}/client/conf/commands-simulator.properties" />
+  	  <property name="commands.f5.file" location="${dist.dir}/client/conf/f5bigip_commands.properties" />
+      <property name="commands.juniper.file" location="${dist.dir}/client/conf/junipersrx_commands.properties" />
+  	  <property name="commands.netscaler.file" location="${dist.dir}/client/conf/netscalerloadbalancer_commands.properties" />
+  	  <property name="commands.vr.file" location="${dist.dir}/client/conf/virtualrouter_commands.properties" />
   
 	<echo message="build-apidocs" />
     <exec dir="${apidoc.scripts.dir}" executable="bash">
       <arg value="build-apidoc.sh" />
       <arg value="${target.dir}/jar" />
       <arg value="${deps.dir}" />
-      <arg value="-f ${commands.file},${commands.ext.file},${commands.simulator.file}" />
+      <arg value="-f ${commands.file},${commands.ext.file},${commands.f5.file},${commands.juniper.file},${commands.netscaler.file},${commands.vr.file}" />
       <arg value="-d ${dist.dir}" />
     </exec>
     <echo message="Result locates at ${dist.dir}/commands.xml" />
diff --git a/client/tomcatconf/f5bigip_commands.properties.in b/client/tomcatconf/f5bigip_commands.properties.in
index c67a8f08ef6..b82f1361a02 100644
--- a/client/tomcatconf/f5bigip_commands.properties.in
+++ b/client/tomcatconf/f5bigip_commands.properties.in
@@ -6,7 +6,7 @@
 #Deprecated commands
 addExternalLoadBalancer = com.cloud.api.commands.AddExternalLoadBalancerCmd;7
 deleteExternalLoadBalancer = com.cloud.api.commands.DeleteExternalLoadBalancerCmd;7
-listExternalLoadBalancer = com.cloud.api.commands.ListExternalLoadBalancerCmd;7
+listExternalLoadBalancers = com.cloud.api.commands.ListExternalLoadBalancersCmd;7
 
 addF5LoadBalancer = com.cloud.api.commands.AddF5LoadBalancerCmd;7
 configureF5LoadBalancer = com.cloud.api.commands.ConfigureF5LoadBalancerCmd;7
diff --git a/client/tomcatconf/junipersrx_commands.properties.in b/client/tomcatconf/junipersrx_commands.properties.in
index a3feb28ca2b..121cad36b01 100644
--- a/client/tomcatconf/junipersrx_commands.properties.in
+++ b/client/tomcatconf/junipersrx_commands.properties.in
@@ -4,7 +4,7 @@
 #### juniper srx firewall commands
 addExternalFirewall = com.cloud.api.commands.AddExternalFirewallCmd;7
 deleteExternalFirewall = com.cloud.api.commands.DeleteExternalFirewallCmd;7
-listExternalFirewall = com.cloud.api.commands.ListExternalFirewallCmd;7
+listExternalFirewalls = com.cloud.api.commands.ListExternalFirewallsCmd;7
 
 addSrxFirewall = com.cloud.api.commands.AddSrxFirewallCmd;7
 deleteSrcFirewall = com.cloud.api.commands.DeleteSrxFirewallCmd;7