buildInitialRoutes: More fixes