Route Bug Fixes