diff --git a/components/metrics/BarChart.js b/components/metrics/BarChart.js
index cd7070e8..8e1784df 100644
--- a/components/metrics/BarChart.js
+++ b/components/metrics/BarChart.js
@@ -52,6 +52,8 @@ export function BarChart({
           return dateFormat(d, 'MMM d', locale);
         case 'month':
           return dateFormat(d, 'MMM', locale);
+        case 'year':
+          return dateFormat(d, 'YYY', locale);
         default:
           return label;
       }
diff --git a/components/pages/settings/teams/TeamLeaveForm.js b/components/pages/settings/teams/TeamLeaveForm.js
index 9b61d4d9..954006ab 100644
--- a/components/pages/settings/teams/TeamLeaveForm.js
+++ b/components/pages/settings/teams/TeamLeaveForm.js
@@ -5,7 +5,7 @@ import useMessages from 'hooks/useMessages';
 export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
   const { del, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(() => del(`/team/${teamId}/users/${userId}`));
+  const { mutate, error, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
 
   const handleSubmit = async () => {
     mutate(
@@ -22,7 +22,7 @@ export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
   return (
     <Form onSubmit={handleSubmit} error={error}>
       <p>
-        <FormattedMessage {...messages.confirmLeave} values={{ name: <b>{teamName}</b> }} />
+        <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
       </p>
       <FormButtons flex>
         <SubmitButton variant="danger" disabled={isLoading}>
diff --git a/components/pages/settings/teams/TeamMemberRemoveButton.js b/components/pages/settings/teams/TeamMemberRemoveButton.js
index 9dde180b..9f326476 100644
--- a/components/pages/settings/teams/TeamMemberRemoveButton.js
+++ b/components/pages/settings/teams/TeamMemberRemoveButton.js
@@ -5,7 +5,7 @@ import { Icon, Icons, LoadingButton, Text } from 'react-basics';
 export function TeamMemberRemoveButton({ teamId, userId, disabled, onSave }) {
   const { formatMessage, labels } = useMessages();
   const { del, useMutation } = useApi();
-  const { mutate, isLoading } = useMutation(() => del(`/team/${teamId}/users/${userId}`));
+  const { mutate, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
 
   const handleRemoveTeamMember = () => {
     mutate(
diff --git a/pages/api/auth/login.ts b/pages/api/auth/login.ts
index 10c92647..64c2c26d 100644
--- a/pages/api/auth/login.ts
+++ b/pages/api/auth/login.ts
@@ -50,7 +50,7 @@ export default async (
 
       return ok(res, {
         token,
-        user: { id: user.id, username: user.username, createdAt: user.createdAt },
+        user: { id: user.id, username: user.username, role: user.role, createdAt: user.createdAt },
       });
     }