Router Fixes