Fixed things, but routes still broken