Fixing Middleware and i18n