diff --git a/src/Cat/Cat.tsx b/src/Cat/Cat.tsx
index f1fe2b72..86f44c10 100644
--- a/src/Cat/Cat.tsx
+++ b/src/Cat/Cat.tsx
@@ -29,21 +29,31 @@ const ReportedTime = ({
 }: {
 	reportedAt: string
 	receivedAt: Date
-}) => (
-	<>
-		<TimeIcon /> <RelativeTime ts={reportedAt} key={reportedAt} />
-		{(receivedAt.getTime() - new Date(reportedAt).getTime()) / 1000 > 300 && (
+}) => {
+	try {
+		const r = new Date(reportedAt)
+		return (
+			<>
+				<TimeIcon /> <RelativeTime ts={r} key={r.toISOString()} />
+				{(receivedAt.getTime() - new Date(reportedAt).getTime()) / 1000 >
+					300 && (
+					<>
+						{' '}
+						<CloudIcon />{' '}
+						<RelativeTime ts={receivedAt} key={receivedAt.toISOString()} />
+					</>
+				)}
+			</>
+		)
+	} catch {
+		return (
 			<>
-				{' '}
 				<CloudIcon />{' '}
-				<RelativeTime
-					ts={receivedAt.toISOString()}
-					key={receivedAt.toISOString()}
-				/>
+				<RelativeTime ts={receivedAt} key={receivedAt.toISOString()} />
 			</>
-		)}
-	</>
-)
+		)
+	}
+}
 
 const ShowCat = ({
 	catId,
@@ -153,17 +163,22 @@ const ShowCat = ({
 	if (error) return <Error error={error} />
 	return (
 		<>
-			{reported.gps && (
-				<Map
-					position={{
-						lat: reported.gps.v.lat.value as number,
-						lng: reported.gps.v.lng.value as number,
-					}}
-					accuracy={reported.gps.v.acc.value as number}
-					heading={reported.gps.v.hdg.value as number}
-					label={catId}
-				/>
-			)}
+			{reported.gps &&
+				reported.gps.v &&
+				reported.gps.v.lat &&
+				reported.gps.v.lng && (
+					<Map
+						position={{
+							lat: reported.gps.v.lat.value as number,
+							lng: reported.gps.v.lng.value as number,
+						}}
+						accuracy={
+							reported.gps.v.acc && (reported.gps.v.acc.value as number)
+						}
+						heading={reported.gps.v.hdg && (reported.gps.v.hdg.value as number)}
+						label={catId}
+					/>
+				)}
 			<Card>
 				<CardHeader className={'cat'}>
 					<AvatarPicker
@@ -240,10 +255,12 @@ const ShowCat = ({
 											({ value }: { value: number }) => value,
 										)}
 									/>
-									<ReportedTime
-										reportedAt={reported.acc.ts.value}
-										receivedAt={reported.acc.v[0].receivedAt}
-									/>
+									<small>
+										<ReportedTime
+											reportedAt={reported.acc.ts.value}
+											receivedAt={reported.acc.v[0].receivedAt}
+										/>
+									</small>
 								</dd>
 							</>
 						)}
diff --git a/src/Map/Map.tsx b/src/Map/Map.tsx
index ed319da3..a012c3ef 100644
--- a/src/Map/Map.tsx
+++ b/src/Map/Map.tsx
@@ -54,7 +54,7 @@ export const Map = ({
 				<Popup>{label}</Popup>
 			</Marker>
 			{accuracy && <Circle center={[lat, lng]} radius={accuracy} />}
-			{heading !== undefined && heading !== null && (
+			{heading && (
 				<LeafletConsumer>
 					{({ map }) => {
 						if (map) {
diff --git a/src/RelativeTime/RelativeTime.tsx b/src/RelativeTime/RelativeTime.tsx
index 864eeecd..76c1c932 100644
--- a/src/RelativeTime/RelativeTime.tsx
+++ b/src/RelativeTime/RelativeTime.tsx
@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react'
 import moment from 'moment'
 
-const getDiffInSeconds = (ts: string) =>
-	(Date.now() - new Date(ts).getTime()) / 1000
+const getDiffInSeconds = (ts: Date) =>
+	(Date.now() - ts.getTime()) / 1000
 
-export const RelativeTime = ({ ts }: { ts: string }) => {
+export const RelativeTime = ({ ts }: { ts: Date }) => {
 	const [label, setLabel] = useState(moment(ts).fromNow())
 	const [diffInSeconds, setDiffInSeconds] = useState(getDiffInSeconds(ts))
 
@@ -28,5 +28,5 @@ export const RelativeTime = ({ ts }: { ts: string }) => {
 		}
 	}, [diffInSeconds, ts])
 
-	return <time dateTime={ts}>{label}</time>
+	return <time dateTime={ts.toISOString()}>{label}</time>
 }