Bug Fixes, Traditional Router Functional