Fix scoped, references and routes