diff --git a/app/javascript/mastodon/components/compacted_status.jsx b/app/javascript/mastodon/components/compacted_status.jsx
index 2195cc64c0..abab0aa8a0 100644
--- a/app/javascript/mastodon/components/compacted_status.jsx
+++ b/app/javascript/mastodon/components/compacted_status.jsx
@@ -11,6 +11,7 @@ import { HotKeys } from 'react-hotkeys';
 
 import AttachmentList from 'mastodon/components/attachment_list';
 import { Icon }  from 'mastodon/components/icon';
+import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import Card from '../features/status/components/card';
 // We use the component (and not the container) since we do not want
@@ -66,10 +67,6 @@ const messages = defineMessages({
 
 class CompactedStatus extends ImmutablePureComponent {
 
-  static contextTypes = {
-    router: PropTypes.object,
-  };
-
   static propTypes = {
     status: ImmutablePropTypes.map,
     previousId: PropTypes.string,
@@ -94,6 +91,7 @@ class CompactedStatus extends ImmutablePureComponent {
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
     history: PropTypes.func,
+    ...WithRouterPropTypes,
   };
 
   // Avoid checking props that are functions (and whose equality will always
diff --git a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
index 84fb45f4f7..e5ae18ef96 100644
--- a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
+++ b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
@@ -18,7 +18,7 @@ class EmojiReactionButton extends PureComponent {
     domain: PropTypes.string,
     url: PropTypes.string,
     staticUrl: PropTypes.string,
-    count: PropTypes.number.isRequired,
+    count: PropTypes.number,
     me: PropTypes.bool,
     onEmojiReact: PropTypes.func,
     onUnEmojiReact: PropTypes.func,
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 2d9f412f15..f31152f1b7 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -181,6 +181,7 @@ en:
         events: Select events to send
         template: Compose your own JSON payload using variable interpolation. Leave blank for default JSON.
         url: Where events will be sent to
+    kmyblue: kmyblue
     labels:
       account:
         discoverable: Feature profile and posts in discovery algorithms
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index ec9e691bb3..2669cb0d49 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -177,6 +177,7 @@ ja:
         events: 送信するイベントを選択
         template: 変数補完を使用して、独自のJSONペイロードを構成できます。デフォルトのJSONを使用する場合は空白のままにします。
         url: イベントの送信先
+    kmyblue: kmyblue
     labels:
       account:
         discoverable: アカウントを見つけやすくする