Fixes with routes