Fixed route issues