diff --git a/src/main/java/net/floodlightcontroller/topology/web/AllBroadcastPortsResource.java b/src/main/java/net/floodlightcontroller/topology/web/AllBroadcastPortsResource.java
index 80deb2e5de67d2efe6d2a6d21a2c69a5fe163868..ad5d956c79313660fb5d58e6ef3b678a1a72e457 100644
--- a/src/main/java/net/floodlightcontroller/topology/web/AllBroadcastPortsResource.java
+++ b/src/main/java/net/floodlightcontroller/topology/web/AllBroadcastPortsResource.java
@@ -16,9 +16,7 @@
 
 package net.floodlightcontroller.topology.web;
 
-import java.util.Set;
 
-import net.floodlightcontroller.core.types.NodePortTuple;
 import net.floodlightcontroller.topology.ITopologyService;
 
 import org.restlet.resource.Get;
@@ -26,7 +24,7 @@ import org.restlet.resource.ServerResource;
 
 public class AllBroadcastPortsResource extends ServerResource {
     @Get("json")
-    public Set<NodePortTuple> retrieve() {
+    public Object retrieve() {
         ITopologyService topology = 
                 (ITopologyService)getContext().getAttributes().
                     get(ITopologyService.class.getCanonicalName());
diff --git a/src/main/resources/floodlightdefault.properties b/src/main/resources/floodlightdefault.properties
index be3f53952893d3cfbfd6f0621e1062bcce2be61c..7c06ba4aaf632de58604a62390d787fe996176a0 100644
--- a/src/main/resources/floodlightdefault.properties
+++ b/src/main/resources/floodlightdefault.properties
@@ -58,8 +58,8 @@ net.floodlightcontroller.restserver.RestApiServer.keyStorePassword=Password
 net.floodlightcontroller.restserver.RestApiServer.httpsNeedClientAuthentication=NO
 net.floodlightcontroller.restserver.RestApiServer.useHttps=NO
 net.floodlightcontroller.restserver.RestApiServer.useHttp=YES
-net.floodlightcontroller.restserver.RestApiServer.httpsPort=11081
-net.floodlightcontroller.restserver.RestApiServer.httpPort=11080
+net.floodlightcontroller.restserver.RestApiServer.httpsPort=8081
+net.floodlightcontroller.restserver.RestApiServer.httpPort=8080
 net.floodlightcontroller.restserver.RestApiServer.accessControlAllowAllOrigins=TRUE
 net.floodlightcontroller.statistics.StatisticsCollector.enable=FALSE
 net.floodlightcontroller.statistics.StatisticsCollector.collectionIntervalPortStatsSeconds=10