Some fix in routes