diff --git a/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java b/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
index a1221fc7af938f71bfa1ee9443076128a4709c90..b2169e1964ca1ebc0a7a7560798a0fe7e1eb8e61 100644
--- a/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
+++ b/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
@@ -173,7 +173,7 @@ public class LearningSwitch
      */
     public OFPort getFromPortMap(IOFSwitch sw, MacAddress mac, VlanVid vlan) {
         if (vlan == VlanVid.FULL_MASK) {
-            vlan = VlanVid.FULL_MASK;
+            vlan = VlanVid.ofVlan(0);
         }
         Map<MacVlanPair, OFPort> swMap = macVlanToSwitchPortMap.get(sw);
         if (swMap != null) {
diff --git a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
index 1235cf522f4e5868eb2bbe8a033de32928aab593..8088f01f6a27dad354bb7cab101ed96feda9cc25 100644
--- a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
+++ b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
@@ -191,7 +191,7 @@ public abstract class ForwardingBase implements IOFMessageListener {
 	 *        written to the switch
 	 * @param flowModCommand flow mod. command to use, e.g. OFFlowMod.OFPFC_ADD,
 	 *        OFFlowMod.OFPFC_MODIFY etc.
-	 * @return srcSwitchIincluded True if the source switch is included in this route
+	 * @return srcSwitchIncluded True if the source switch is included in this route
 	 */
 	@LogMessageDocs({
 		@LogMessageDoc(level="WARN",